Merge pull request #1037 from fmount/manila_cephnfs

Remove pcs colocation constraints from manila-share when cephnfs

Author: openshift-merge-bot[bot]

tests/roles/manila_adoption/tasks/ceph.yaml

@@ -23,6 +23,8 @@
         src: manila_cephfs.yaml.j2
         dest: /tmp/manila_cephfs.yaml
         mode: "0600"
+      vars:
+        tripleo_ganesha_vip: "{{ cephnfs_vip.stdout }}"
 
     - name: Deploy podified Manila with cephfs backend
       ansible.builtin.shell: |

tests/roles/manila_adoption/templates/manila_cephfs.yaml.j2

@@ -48,7 +48,7 @@ spec:
             cephfs_protocol_helper_type= {{ (manila_backend == "cephfs") | ternary('CEPHFS', 'NFS') }}
             {% if manila_backend == "cephnfs" -%}
             cephfs_nfs_cluster_id=cephfs
-            cephfs_ganesha_server_ip= {{ cephnfs_vip | default("") }}
+            cephfs_ganesha_server_ip= {{ tripleo_ganesha_vip | default("") }}
             {%- endif %}
 
           replicas: 1

tests/roles/stop_openstack_services/tasks/main.yaml

@@ -6,6 +6,24 @@
       CONTROLLER2_SSH="{{ controller2_ssh }}"
       CONTROLLER3_SSH="{{ controller3_ssh }}"
 
+- name: Remove colocation constraints between manila-share and ceph-nfs
+  when: manila_backend == "cephnfs"
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    {{ stop_openstack_services_shell_vars }}
+
+    echo "Removing Pacemaker constraints between manila-share and ceph-nfs"
+    for i in {1..3}; do
+        SSH_CMD="CONTROLLER${i}_SSH"
+        if [ ! -z "${!SSH_CMD}" ]; then
+            echo "Using controller $i to run pacemaker commands"
+            ${!SSH_CMD} sudo pcs constraint remove colocation-openstack-manila-share-ceph-nfs-INFINITY
+            ${!SSH_CMD} sudo pcs constraint remove order-ceph-nfs-openstack-manila-share-Optional
+            break
+        fi
+    done
+
 - name: stop control plane services
   no_log: "{{ use_no_log }}"
   ansible.builtin.shell: |