]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
facts: set is_rgw_instances_defined from configure_dashboard v6.0.28 v6.0.28.0
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 11 Aug 2022 08:28:41 +0000 (10:28 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 11 Aug 2022 14:59:34 +0000 (16:59 +0200)
When we come from configure_dashboard.yml, this fact should be set if
`rgw_instances` is defined in group_vars/host_vars. Otherwise, the next
task that set the fact `rgw_instances` will be run as it will assume it
wasn't user defined.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2117294
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-facts/tasks/set_radosgw_address.yml

index aa85aaf284c40cd11f611872af9b046f30ea16b3..52cd5ab37c98368e5756a01bb731e418837cd060 100644 (file)
 
 - name: set_fact is_rgw_instances_defined
   set_fact:
-    is_rgw_instances_defined: "{{ rgw_instances is defined }}"
+    is_rgw_instances_defined: "{{ hostvars[ceph_dashboard_call_item | default(inventory_hostname)]['rgw_instances'] is defined }}"
+    delegate_to: "{{ ceph_dashboard_call_item if ceph_dashboard_call_item is defined else inventory_hostname }}"
+    delegate_facts: "{{ true if ceph_dashboard_call_item is defined else false }}"
   when:
-    - inventory_hostname in groups.get(rgw_group_name, [])
+    - inventory_hostname in groups.get(rgw_group_name, []) or
+      ceph_dashboard_call_item is defined
     - rgw_multisite | bool
 
 - name: set_fact rgw_instances with rgw multisite