From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 9 Apr 2020 12:48:53 +0000 (+0200)
Subject: osd: fix monitor_name error when scaling out OSDs
X-Git-Tag: v4.0.19~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b79d7372965eea22921d67ec2d6c8d6cc101eab;p=ceph-ansible.git

osd: fix monitor_name error when scaling out OSDs

This commit fixes a bug when trying to scale out osd nodes with
`crush_rule_config` is enabled.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1822599

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 4bcc52cb2aad9bac563025ba4fd9ae4565524b67)
---

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index b20a768dc..216e09b31 100644
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -30,13 +30,25 @@
 
 - name: set_fact monitor_name ansible_hostname
   set_fact:
-    monitor_name: "{{ ansible_hostname }}"
-  when: not mon_use_fqdn | bool
+    monitor_name: "{{ hostvars[item]['ansible_hostname'] }}"
+  delegate_to: "{{ item }}"
+  delegate_facts: true
+  with_items: "{{ groups.get(mon_group_name, []) }}"
+  run_once: true
+  when:
+    - groups.get(mon_group_name, []) | length > 0
+    - not mon_use_fqdn | bool
 
 - name: set_fact monitor_name ansible_fqdn
   set_fact:
-    monitor_name: "{{ ansible_fqdn }}"
-  when: mon_use_fqdn | bool
+    monitor_name: "{{ hostvars[item]['ansible_fqdn'] }}"
+  delegate_to: "{{ item }}"
+  delegate_facts: true
+  with_items: "{{ groups.get(mon_group_name, []) }}"
+  run_once: true
+  when:
+    - groups.get(mon_group_name, []) | length > 0
+    - mon_use_fqdn | bool
 
 - name: find a running monitor
   when: groups.get(mon_group_name, []) | length > 0