From: Seena Fallah <seenafallah@gmail.com>
Date: Mon, 11 Mar 2024 12:13:07 +0000 (+0100)
Subject: ceph-config: check for set_radosgw_address before importing task
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fb76ea3cca518c35fc41ba4eb3b5a8f657250369;p=ceph-ansible.git

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 e7fbf8e0b..acfee21d1 100644
--- 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 371e3436f..6a36e8b66 100644
--- 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