From ac5353a2d8cf19e39e119b0398f869c8b2a1c097 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 26 Aug 2021 12:06:11 -0400 Subject: [PATCH] cephadm-adopt: fix orch host add with FQDN When a node is configured with FQDN as the hostname value then the `ceph orch host add` command will fail because the `ansible_hostname` used by that command contains the short hostname which won't match the current hostname (FQDN) Instead we can use the ansible_nodename fact. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1997083 Signed-off-by: Dimitri Savineau (cherry picked from commit 2630f8d47a790d3b0c02da6e8fcbb01649e354fd) --- infrastructure-playbooks/cephadm-adopt.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index f8629b1fb8..b65be1e4d2 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -291,12 +291,12 @@ when: is_hci | bool - name: manage nodes with cephadm - command: "{{ ceph_cmd }} orch host add {{ ansible_facts['hostname'] }} {{ ansible_facts['default_ipv4']['address'] }} {{ group_names | join(' ') }}" + command: "{{ ceph_cmd }} orch host add {{ ansible_facts['nodename'] }} {{ ansible_facts['default_ipv4']['address'] }} {{ group_names | join(' ') }}" changed_when: false delegate_to: '{{ groups[mon_group_name][0] }}' - name: add ceph label for core component - command: "{{ ceph_cmd }} orch host label add {{ ansible_facts['hostname'] }} ceph" + command: "{{ ceph_cmd }} orch host label add {{ ansible_facts['nodename'] }} ceph" changed_when: false delegate_to: '{{ groups[mon_group_name][0] }}' when: inventory_hostname in groups.get(mon_group_name, []) or @@ -738,7 +738,7 @@ command: > {{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} orch apply rgw {{ ansible_facts['hostname'] }} - --placement='count-per-host:{{ radosgw_num_instances }} {{ ansible_facts['hostname'] }}' + --placement='count-per-host:{{ radosgw_num_instances }} {{ ansible_facts['nodename'] }}' --port={{ radosgw_frontend_port }} {{ '--ssl' if radosgw_frontend_ssl_certificate else '' }} changed_when: false @@ -751,7 +751,7 @@ command: > {{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} orch apply rgw {{ ansible_facts['hostname'] }}.{{ item.rgw_realm }}.{{ item.rgw_zone }}.{{ item.radosgw_frontend_port }} - --placement={{ ansible_facts['hostname'] }} + --placement={{ ansible_facts['nodename'] }} --realm={{ item.rgw_realm }} --zone={{ item.rgw_zone }} --port={{ item.radosgw_frontend_port }} {{ '--ssl' if radosgw_frontend_ssl_certificate else '' }}