From 9aa9b4dda2e9e8d32c07c8648f44a628d8b4ead4 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 28 Oct 2021 13:43:57 +0200 Subject: [PATCH] Revert "cephadm: use public_network when adding host" This reverts commit 7a12b854c47c37dbff21ce36af5bc5adc4eda68b. Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/cephadm-adopt.yml | 6 +----- infrastructure-playbooks/cephadm.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 8553d8691..23556245c 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -127,10 +127,6 @@ - not containerized_deployment | bool - ceph_docker_registry_auth | bool - - import_role: - name: ceph-facts - tasks_from: set_monitor_address.yml - - name: "pulling {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} image" command: "{{ timeout_command }} {{ container_binary }} pull {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" changed_when: false @@ -300,7 +296,7 @@ when: is_hci | bool - name: manage nodes with cephadm - command: "{{ ceph_cmd }} orch host add {{ ansible_facts['nodename'] }} {{ _current_monitor_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] }}' diff --git a/infrastructure-playbooks/cephadm.yml b/infrastructure-playbooks/cephadm.yml index b980fd7ef..7456e4c95 100644 --- a/infrastructure-playbooks/cephadm.yml +++ b/infrastructure-playbooks/cephadm.yml @@ -220,10 +220,6 @@ - import_role: name: ceph-defaults - - import_role: - name: ceph-facts - tasks_from: set_monitor_address.yml - - name: get the cephadm ssh pub key command: "{{ cephadm_cmd }} shell -- ceph --cluster {{ cluster }} cephadm get-pub-key" changed_when: false @@ -245,7 +241,7 @@ CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' - name: manage nodes with cephadm - command: "{{ cephadm_cmd }} shell -- ceph --cluster {{ cluster }} orch host add {{ ansible_facts['hostname'] }} {{ _current_monitor_address }} {{ group_names | join(' ') }} {{ '_admin' if mon_group_name | default('mons') in group_names else '' }}" + command: "{{ cephadm_cmd }} shell -- ceph --cluster {{ cluster }} orch host add {{ ansible_facts['hostname'] }} {{ ansible_facts['default_ipv4']['address'] }} {{ group_names | join(' ') }} {{ '_admin' if mon_group_name | default('mons') in group_names else '' }}" changed_when: false delegate_to: '{{ groups[mon_group_name][0] }}' environment: -- 2.39.5