just remove overrides and use local vars

Author: katarimanojk

Makefile

@@ -98,7 +98,7 @@ test-with-ironic: ## Launch test suite with Ironic
 test-configure-object: TEST_OUTFILE ?= tests/logs/test_configure_object_out_$(shell date +%FT%T%Z).log
 test-configure-object: ## Configure Swift object store to use Ceph RGW
 	mkdir -p tests/logs
-	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_SECRETS) -e @$(TEST_VARS) -e @$(TEST_CEPH_OVERRIDES) $(TEST_ARGS) tests/playbooks/configure_swift_rgw.yaml 2>&1 | tee $(TEST_OUTFILE)
+	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_SECRETS) -e @$(TEST_VARS) $(TEST_ARGS) tests/playbooks/configure_swift_rgw.yaml 2>&1 | tee $(TEST_OUTFILE)
 
 ##@ DOCS
 

tests/playbooks/configure_swift_rgw.yaml

@@ -3,15 +3,6 @@
   hosts: localhost
   gather_facts: false
   tasks:
-    - name: Set variables for ceph overrides generation
-      ansible.builtin.set_fact:
-        ansible_user_dir: "{{ ansible_user_dir | default(ansible_env.HOME) }}"
-        dpa_dir: >-
-          {{ dpa_dir_override | default(
-            ansible_user_dir +
-            '/src/github.com/openstack-k8s-operators/data-plane-adoption'
-          ) }}
-
     - name: Extract Swift password from OpenShift secret
       ansible.builtin.shell: |
         oc get secret osp-secret -o json | jq -r '.data.SwiftPassword' | base64 -d
@@ -28,25 +19,17 @@
         keystone_url: "{{ keystone_protocol | default('http') }}://{{ keystone_svc_lb_ip.stdout | ansible.utils.ipwrap }}:5000"
       when: keystone_svc_lb_ip.stdout | length > 0
 
-    - name: Set Ceph relevant network facts
+    - name: Set variables for Ceph RGW configuration
       ansible.builtin.set_fact:
-        ceph_storage_net_prefix: "2620:cf:cf:cccc"
-
-    - name: Build ceph RGW overrides for configure_object
-      ansible.builtin.blockinfile:
-        marker_begin: "BEGIN ceph nodes vars for configure rgw object"
-        marker_end: "END ceph nodes vars for configure rgw object"
-        path: "{{ dpa_dir }}/tests/ceph_overrides.yaml"
-        block: |
-          ceph_keystone_ep: "{{ keystone_url }}"
-          ceph_keystone_swift_pwd: "{{ swift_password_result.stdout }}"
-          # rgw vip is required by configure_object task
-          ceph_rgw_virtual_ips_list:
-            - {{ ceph_storage_net_prefix }}::2/64
+        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: |
@@ -61,7 +44,13 @@
   gather_facts: true
   vars:
     shell_header: "set -euo pipefail"
+    ceph_storage_net_prefix: "2620:cf:cf:cccc"
   tasks:
+    - name: Set Ceph RGW virtual IPs list
+      ansible.builtin.set_fact:
+        ceph_rgw_virtual_ips_list:
+          - "{{ ceph_storage_net_prefix }}::2/64"
+
     - name: Configure swift endpoints to use rgw
       ansible.builtin.import_role:
         name: ceph_migrate