facts: fix osp/ceph external use case

d6da508a9b 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 commit 2592a1e1e8)
pull/4933/head
Guillaume Abrioux 2020-01-13 15:30:13 +01:00
parent 532abbb9b2
commit 266c4c7763
1 changed files with 74 additions and 71 deletions

View File

@ -38,23 +38,26 @@
monitor_name: "{{ ansible_fqdn }}" monitor_name: "{{ ansible_fqdn }}"
when: mon_use_fqdn | bool when: mon_use_fqdn | bool
- name: set_fact container_exec_cmd - name: find a running monitor
when: groups.get(mon_group_name, []) | length > 0
block:
- name: set_fact container_exec_cmd
set_fact: 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'] }}" 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: when:
- containerized_deployment | bool - containerized_deployment | bool
- groups.get(mon_group_name, []) | length > 0
- name: find a running mon container - name: find a running mon container
command: "{{ container_binary }} ps -q --filter name=ceph-mon-{{ hostvars[item]['ansible_hostname'] }}" command: "{{ container_binary }} ps -q --filter name=ceph-mon-{{ hostvars[item]['ansible_hostname'] }}"
register: find_running_mon_container register: find_running_mon_container
failed_when: false failed_when: false
run_once: true run_once: true
delegate_to: "{{ item }}" delegate_to: "{{ item }}"
with_items: "{{ groups.get(mon_group_name, []) }}" with_items: "{{ groups.get(mon_group_name, []) }}"
when: containerized_deployment | bool when:
- containerized_deployment | bool
- name: check for a ceph mon socket - name: check for a ceph mon socket
shell: stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mon*.asok shell: stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mon*.asok
changed_when: false changed_when: false
failed_when: false failed_when: false
@ -63,9 +66,10 @@
run_once: true run_once: true
delegate_to: "{{ item }}" delegate_to: "{{ item }}"
with_items: "{{ groups.get(mon_group_name, []) }}" 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 - name: check if the ceph mon socket is in-use
command: grep -q {{ item.stdout }} /proc/net/unix command: grep -q {{ item.stdout }} /proc/net/unix
changed_when: false changed_when: false
failed_when: false failed_when: false
@ -77,7 +81,7 @@
- not containerized_deployment | bool - not containerized_deployment | bool
- item.rc == 0 - item.rc == 0
- name: set_fact running_mon - non_container - name: set_fact running_mon - non_container
set_fact: set_fact:
running_mon: "{{ hostvars[item.item.item]['inventory_hostname'] }}" running_mon: "{{ hostvars[item.item.item]['inventory_hostname'] }}"
with_items: "{{ mon_socket.results }}" with_items: "{{ mon_socket.results }}"
@ -87,7 +91,7 @@
- item.rc is defined - item.rc is defined
- item.rc == 1 - item.rc == 1
- name: set_fact running_mon - container - name: set_fact running_mon - container
set_fact: set_fact:
running_mon: "{{ item.item }}" running_mon: "{{ item.item }}"
run_once: true run_once: true
@ -96,16 +100,16 @@
- containerized_deployment | bool - containerized_deployment | bool
- item.stdout_lines | default([]) | length > 0 - item.stdout_lines | default([]) | length > 0
- name: set_fact _container_exec_cmd - name: set_fact _container_exec_cmd
set_fact: set_fact:
_container_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] if running_mon is undefined else running_mon }}" _container_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] if running_mon is undefined else running_mon }}"
when: when:
- containerized_deployment | bool - containerized_deployment | bool
# this task shouldn't run in a rolling_update situation # this task shouldn't run in a rolling_update situation
# because it blindly picks a mon, which may be down because # because it blindly picks a mon, which may be down because
# of the rolling update # of the rolling update
- name: is ceph running already? - name: is ceph running already?
command: "{{ timeout_command }} {{ _container_exec_cmd | default('') }} ceph --cluster {{ cluster }} -s -f json" command: "{{ timeout_command }} {{ _container_exec_cmd | default('') }} ceph --cluster {{ cluster }} -s -f json"
changed_when: false changed_when: false
failed_when: false failed_when: false
@ -115,7 +119,6 @@
delegate_to: "{{ groups[mon_group_name][0] if running_mon is undefined else running_mon }}" delegate_to: "{{ groups[mon_group_name][0] if running_mon is undefined else running_mon }}"
when: when:
- not rolling_update | bool - not rolling_update | bool
- groups.get(mon_group_name, []) | length > 0
# set this as a default when performing a rolling_update # set this as a default when performing a rolling_update
# so the rest of the tasks here will succeed # so the rest of the tasks here will succeed