From 858e50da6b6a06ff89d74cc1d0e1e4f3790754fc Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Mon, 7 Sep 2020 14:02:06 +0200 Subject: [PATCH] Add --cluster option on ceph require-osd-release command On DCN environments, or when multiple ceph cluster are configured, we need to specify the cluster name before running the command or the rolling_update playbook will fail during minor updates. Closes: https://bugzilla.redhat.com/1876447 Signed-off-by: Francesco Pantano (cherry picked from commit cb64df30b687d95704bac76ed0b4f83dfc3ca992) --- infrastructure-playbooks/rolling_update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 2f2e45b8b..4dc9ee6c1 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -855,7 +855,7 @@ name: ceph-facts - name: container | disallow pre-nautilus OSDs and enable all new nautilus-only functionality - command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph osd require-osd-release nautilus" + command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release nautilus" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True when: containerized_deployment | bool @@ -867,7 +867,7 @@ when: not containerized_deployment | bool - name: container | enable msgr2 protocol - command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph mon enable-msgr2" + command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} mon enable-msgr2" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True when: containerized_deployment | bool -- 2.39.5