From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 16 Apr 2020 18:37:02 +0000 (-0400)
Subject: rolling_update: require_osd_release pacific
X-Git-Tag: v6.0.0alpha2~218
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7b620a22bc48d299b442b07228529a08ac048bf3;p=ceph-ansible.git

rolling_update: require_osd_release pacific

Since [1] we need to set pacific for the required OSD release during the
upgrade.

[1] https://github.com/ceph/ceph/commit/cc99c3bc

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index e7a4980d4..c692c32ef 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -921,14 +921,14 @@
     - import_role:
         name: ceph-facts
 
-    - name: container | disallow pre-octopus OSDs and enable all new octopus-only functionality
-      command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph osd require-osd-release octopus"
+    - 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"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       run_once: True
       when: containerized_deployment | bool
 
-    - name: non container | disallow pre-octopus OSDs and enable all new octopus-only functionality
-      command: "ceph --cluster {{ cluster }} osd require-osd-release octopus"
+    - name: non container | disallow pre-pacific OSDs and enable all new pacific-only functionality
+      command: "ceph --cluster {{ cluster }} osd require-osd-release pacific"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       run_once: True
       when: not containerized_deployment | bool