]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Add --cluster option on ceph require-osd-release command
authorFrancesco Pantano <fpantano@redhat.com>
Mon, 7 Sep 2020 12:02:06 +0000 (14:02 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 7 Sep 2020 14:31:14 +0000 (16:31 +0200)
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 <fpantano@redhat.com>
infrastructure-playbooks/rolling_update.yml

index 4a8aacdd17d00854ae005eaee1f3936c6f4ffd26..5841286fce646c10d5d5ef12f17897b6e065aa6c 100644 (file)
         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
       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