mirror of https://github.com/ceph/ceph-ansible.git
facts: fix osp/ceph external use case
pull/4933/headd6da508a9b
broke the osp/ceph external use case. We must skip these tasks when no monitor is present in the inventory. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1790508 Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commit2592a1e1e8
)
parent
532abbb9b2
commit
266c4c7763
|
@ -38,12 +38,14 @@
|
|||
monitor_name: "{{ ansible_fqdn }}"
|
||||
when: mon_use_fqdn | bool
|
||||
|
||||
- name: find a running monitor
|
||||
when: groups.get(mon_group_name, []) | length > 0
|
||||
block:
|
||||
- name: set_fact container_exec_cmd
|
||||
set_fact:
|
||||
container_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] if not rolling_update else hostvars[mon_host | default(groups[mon_group_name][0])]['ansible_hostname'] }}"
|
||||
when:
|
||||
- containerized_deployment | bool
|
||||
- groups.get(mon_group_name, []) | length > 0
|
||||
|
||||
- name: find a running mon container
|
||||
command: "{{ container_binary }} ps -q --filter name=ceph-mon-{{ hostvars[item]['ansible_hostname'] }}"
|
||||
|
@ -52,7 +54,8 @@
|
|||
run_once: true
|
||||
delegate_to: "{{ item }}"
|
||||
with_items: "{{ groups.get(mon_group_name, []) }}"
|
||||
when: containerized_deployment | bool
|
||||
when:
|
||||
- containerized_deployment | bool
|
||||
|
||||
- name: check for a ceph mon socket
|
||||
shell: stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mon*.asok
|
||||
|
@ -63,7 +66,8 @@
|
|||
run_once: true
|
||||
delegate_to: "{{ item }}"
|
||||
with_items: "{{ groups.get(mon_group_name, []) }}"
|
||||
when: not containerized_deployment | bool
|
||||
when:
|
||||
- not containerized_deployment | bool
|
||||
|
||||
- name: check if the ceph mon socket is in-use
|
||||
command: grep -q {{ item.stdout }} /proc/net/unix
|
||||
|
@ -115,7 +119,6 @@
|
|||
delegate_to: "{{ groups[mon_group_name][0] if running_mon is undefined else running_mon }}"
|
||||
when:
|
||||
- not rolling_update | bool
|
||||
- groups.get(mon_group_name, []) | length > 0
|
||||
|
||||
# set this as a default when performing a rolling_update
|
||||
# so the rest of the tasks here will succeed
|
||||
|
|
Loading…
Reference in New Issue