ceph-config: check for set_radosgw_address before importing task

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 49ec2479ea347d29616feec52386562dfa406676)

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index e7fbf8e0b04304ea28e986046d2442707c3227b4..acfee21d1abaa53f78cf0387b4a9d210addccb4f 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -171,7 +171,9 @@
   ansible.builtin.import_role:
     name: ceph-facts
     tasks_from: set_radosgw_address.yml
-  when: inventory_hostname in groups.get(rgw_group_name, [])
+  when:
+    - set_radosgw_address | default(true)
+    - inventory_hostname in groups.get(rgw_group_name, [])
 
 - name: Generate Ceph file
   openstack.config_template.config_template:

diff --git a/roles/ceph-container-common/tasks/main.yml b/roles/ceph-container-common/tasks/main.yml
index 371e3436f01190981b38499df0c7fb098b5fcd17..6a36e8b6603f9cf8200bc63a29a61ab178407975 100644 (file)
--- a/roles/ceph-container-common/tasks/main.yml
+++ b/roles/ceph-container-common/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Generate systemd ceph-mon target file
+- name: Generate systemd ceph target file
   ansible.builtin.copy:
     src: ceph.target
     dest: /etc/systemd/system/ceph.target