From 22865cde9c7cb3be30c359ce8679ec841b16a663 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 17 Jan 2020 15:50:40 +0100 Subject: [PATCH] handler: fix call to container_exec_cmd in handler_osds When unsetting the noup flag, we must call container_exec_cmd from the delegated node (first mon member) Also, adding a `run_once: true` because this task needs to be run only 1 time. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1792320 Signed-off-by: Guillaume Abrioux --- roles/ceph-handler/tasks/handler_osds.yml | 1 + roles/ceph-nfs/tasks/pre_requisite_container.yml | 8 ++++++++ roles/ceph-osd/tasks/main.yml | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/roles/ceph-handler/tasks/handler_osds.yml b/roles/ceph-handler/tasks/handler_osds.yml index 390b84b2c..c5fce6c5c 100644 --- a/roles/ceph-handler/tasks/handler_osds.yml +++ b/roles/ceph-handler/tasks/handler_osds.yml @@ -6,6 +6,7 @@ - name: unset noup flag command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd unset noup" delegate_to: "{{ groups[mon_group_name][0] }}" + run_once: true changed_when: False # This does not just restart OSDs but everything else too. Unfortunately diff --git a/roles/ceph-nfs/tasks/pre_requisite_container.yml b/roles/ceph-nfs/tasks/pre_requisite_container.yml index 8112a8e21..aaff416fc 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml @@ -1,6 +1,14 @@ --- - name: keyring related tasks block: + - name: set_fact container_exec_cmd + set_fact: + container_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[item]['ansible_hostname'] }}" + with_items: "{{ groups.get(mon_group_name, []) }}" + delegate_to: "{{ item }}" + delegate_facts: true + run_once: true + - name: get keys from monitors command: "{{ hostvars[groups.get(mon_group_name)[0]]['container_exec_cmd'] }} ceph --cluster {{ cluster }} auth get {{ item.name }}" register: _rgw_keys diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml index 79ac50fce..d62944526 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -3,6 +3,15 @@ set_fact: add_osd: "{{ groups[osd_group_name] | length != ansible_play_hosts_all | length }}" +- name: set_fact container_exec_cmd + set_fact: + container_exec_cmd: "{{ container_binary }} exec ceph-mon-{{ hostvars[item]['ansible_hostname'] }}" + with_items: "{{ groups.get(mon_group_name, []) }}" + delegate_to: "{{ item }}" + delegate_facts: true + run_once: true + when: containerized_deployment | bool + - name: include_tasks system_tuning.yml include_tasks: system_tuning.yml -- 2.39.5