Merge "Fix instance-ha role to fully support ocata"

playbooks/overcloud-instance-ha.yml

@@ -1,11 +1,5 @@
 ---
 
-- name:  Configure STONITH for all the hosts on the overcloud
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - stonith-config
-
 - name: Configure Instance HA
   hosts: undercloud
   gather_facts: no

roles/instance-ha/defaults/main.yml

@@ -3,5 +3,5 @@
 overcloud_working_dir: "/home/heat-admin"
 working_dir: "/home/stack"
 
-apply_instance_ha: true
+# apply or undo
-undo_instance_ha: false
+instance_ha_config: apply

roles/instance-ha/tasks/apply.yml

@@ -1,4 +1,10 @@
 ---
+- name: Apply STONITH for compute nodes
+  include_role:                                                                 
+    name: stonith-config
+  vars:                                                                         
+    stonith_devices: "computes"
+
 - name: Disable openstack-nova-compute on compute
   service:
     name: openstack-nova-compute
@@ -102,6 +108,12 @@
     cat {{ working_dir }}/overcloudrc
   register: overcloudrc
 
+- name: Remove overcloudrc file on overcloud-controller-0 (if exists)
+  file:
+    path: "{{ overcloud_working_dir }}/overcloudrc"
+    state: absent
+  delegate_to: overcloud-controller-0
+
 - name: Copy overcloudrc file on overcloud-controller-0
   lineinfile:
     destfile: "{{ overcloud_working_dir }}/overcloudrc"

roles/instance-ha/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 
-- include: apply.yml                                                 
+- include: apply.yml
-  when: apply_instance_ha|bool                                               
+  when: instance_ha_config == 'apply'
-                                                                                 
+
 - include: undo.yml
-  when: undo_instance_ha|bool                                               
+  when: instance_ha_config == 'undo'

roles/instance-ha/tasks/undo.yml

@@ -65,24 +65,12 @@
             pcs --force resource delete $resourceid
            done
 
-    - name: Erase the status entries corresponding to the compute nodes
+#    - name: Erase the status entries corresponding to the compute nodes
-      shell: |
+#      shell: |
-          cibadmin --delete --xml-text "<node id='{{ item }}'/>"
+#          cibadmin --delete --xml-text "<node id='{{ item }}'/>"
-          cibadmin --delete --xml-text "<node_state id={{ item }}'/>"
+#          cibadmin --delete --xml-text "<node_state id={{ item }}'/>"
-      with_items:
+#      with_items:
-        - "{{ groups['compute'] }}"
+#        - "{{ groups['compute'] }}"
-
-    - name: Delete pacemaker compute remote resource
-      shell: pcs resource delete {{ item }}
-      with_items: "{{ groups['compute'] }}"
-
-    - name: Delete pacemaker compute remote node
-      shell: crm_node --force --remove {{ item }}
-      with_items: "{{ groups['compute'] }}"
-
-    - name: Delete resource nova-evacuate
-      shell: >
-        pcs resource delete nova-evacuate
 
     - name: Remove constraints related to role controller
       shell: |
@@ -186,3 +174,10 @@
   with_items:
     - "{{ groups['controller'] }}"
     - "{{ groups['compute'] }}"
+
+- name: Undo STONITH for compute nodes
+  include_role:                                                                 
+    name: stonith-config
+  vars:                                                                         
+    stonith_config: "undo"
+    stonith_devices: "computes"