standardizing some of the plays to use across all inventories

reference-architecture/vmware-ansible/playbooks/clean.yaml

@@ -21,7 +21,9 @@
         state: absent
         force: true
       with_items: 
-      - "{{ groups['nodes'] }}"
+      - "{{ groups['masters'] }}"
+      - "{{ groups['apps'] }}"
+      - "{{ groups['infras'] }}"
       - "{{ groups['haproxy'] }}"
 
 - hosts: localhost

reference-architecture/vmware-ansible/roles/create-vm-prod-ose/tasks/main.yaml

@@ -1,14 +1,4 @@
 ---
-#- name: Assign app memory for container_storage
-#  set_fact:
-#    app_memory: 32768
-#  when: "'cns' in container_storage"
-
-#- name: Assign app memory for container_storage
-#  set_fact:
-#    app_memory: 8192
-#  when:"'cns' not in container_storage"
-
 - name: Create production master node VMs on vCenter
   vmware_guest:
     hostname: "{{ openshift_cloudprovider_vsphere_host }}"
@@ -23,7 +13,6 @@
     state: poweredon
     wait_for_ip_address: true
     folder: "{{ openshift_cloudprovider_vsphere_datacenter }}/vm/{{ openshift_cloudprovider_vsphere_folder }}"
-    annotation: "{{ hostvars[item].openshift_node_labels }}"
     disk:
     - size_gb: 60
       datastore: "{{ openshift_cloudprovider_vsphere_datastore }}"
@@ -79,7 +68,6 @@
       datastore: "{{ openshift_cloudprovider_vsphere_datastore }}"
       type: eagerZeroedThick
     folder: "{{ openshift_cloudprovider_vsphere_datacenter }}/vm/{{ openshift_cloudprovider_vsphere_folder }}" 
-    annotation: "{{ hostvars[item].openshift_node_labels }}"
     hardware:
       memory_mb: 8192
     networks:
@@ -122,7 +110,6 @@
       datastore: "{{ openshift_cloudprovider_vsphere_datastore }}"
       type: eagerZeroedThick
     folder: "{{ openshift_cloudprovider_vsphere_datacenter }}/vm/{{ openshift_cloudprovider_vsphere_folder }}" 
-    annotation: "{{ hostvars[item].openshift_node_labels }}"
     hardware:
       memory_mb: "8192"
     networks: