switch_to_containers: support multiple rgw instances per host

add multiple rgw instances per host in switch_to_containers playbook.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index ff3fcd6d38efa66328c40e2dd7c87f373abee365..a2dd9c9891fc3d97d3e25f0c60b2652c9f7bab13 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -421,18 +421,6 @@
   serial: 1
   become: true
   pre_tasks:
-
-    - name: stop non-containerized ceph rgw(s)
-      service:
-        name: "ceph-radosgw@rgw.{{ ansible_hostname }}"
-        state: stopped
-        enabled: no
-
-    - name: remove old systemd unit file
-      file:
-        path: /usr/lib/systemd/system/ceph-radosgw@.service
-        state: absent
-
     - set_fact:
         ceph_uid: 64045
       when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
@@ -457,6 +445,18 @@
     - import_role:
         name: ceph-facts
 
+    - name: stop non-containerized ceph rgw(s)
+      service:
+        name: "ceph-radosgw@rgw.{{ ansible_hostname }}.{{ item.instance_name }}"
+        state: stopped
+        enabled: no
+      with_items: "{{ rgw_instances }}"
+
+    - name: remove old systemd unit file
+      file:
+        path: /usr/lib/systemd/system/ceph-radosgw@.service
+        state: absent
+
     - import_role:
         name: ceph-handler