making the playbook clean

Author: katarimanojk

tests/playbooks/configure_swift_rgw.yaml

@@ -1,7 +1,10 @@
 ---
-- name: Build Ceph RGW overrides for configure_object
+- name: Configure Swift to use Ceph RGW
   hosts: localhost
-  gather_facts: false
+  gather_facts: true
+  vars:
+    shell_header: "set -euo pipefail"
+    rgw_service_name: "rgw.rgw"
   tasks:
     - name: Extract Swift password from OpenShift secret
       ansible.builtin.shell: |
@@ -24,33 +27,15 @@
         ceph_keystone_ep: "{{ keystone_url }}"
         ceph_keystone_swift_pwd: "{{ swift_password_result.stdout }}"
 
-- name: Configure Ceph RGW Keystone settings
-  hosts: "{{ groups['ceph'][0] | default([]) }}"
-  gather_facts: true
-  vars:
-    ceph_keystone_ep: "{{ hostvars['localhost']['ceph_keystone_ep'] }}"
-    ceph_keystone_swift_pwd: "{{ hostvars['localhost']['ceph_keystone_swift_pwd'] }}"
-  tasks:
     - name: Configure Ceph RGW Keystone settings
       ansible.builtin.shell: |
         sudo cephadm shell -- ceph config set global rgw_keystone_url {{ ceph_keystone_ep }}
         sudo cephadm shell -- ceph config set global rgw_keystone_admin_password {{ ceph_keystone_swift_pwd }}
         # refresh rgw after updating keystone rgw config
-        sudo cephadm shell -- ceph orch redeploy rgw.rgw
+        sudo cephadm shell -- ceph orch redeploy {{ rgw_service_name }}
+      delegate_to: "{{ groups['ceph'][0] }}"
       changed_when: true
 
-- name: Configure swift object store
-  hosts: localhost
-  gather_facts: true
-  vars:
-    shell_header: "set -euo pipefail"
-    #ceph_rgw_vip: "2620:cf:cf:cccc::2/64" (ipv6) or "172.18.0.2/24" (ipv4)
-  tasks:
-    - name: Set Ceph RGW virtual IPs list
-      ansible.builtin.set_fact:
-        ceph_rgw_virtual_ips_list:
-          - "{{ ceph_rgw_vip }}"
-
     - name: Configure swift endpoints to use rgw
       ansible.builtin.import_role:
         name: ceph_migrate