From: Francesco Pantano Date: Mon, 7 Sep 2020 12:02:06 +0000 (+0200) Subject: Add --cluster option on ceph require-osd-release command X-Git-Tag: v6.0.0alpha2~50 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb64df30b687d95704bac76ed0b4f83dfc3ca992;p=ceph-ansible.git 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 --- diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 4a8aacdd1..5841286fc 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -858,7 +858,7 @@ name: ceph-facts - name: container | disallow pre-pacific OSDs and enable all new pacific-only functionality - command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph osd require-osd-release pacific" + command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release pacific" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True when: containerized_deployment | bool @@ -870,7 +870,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