From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 20 Mar 2019 12:25:26 +0000 (+0100)
Subject: update: enable new nautilus-only functionality
X-Git-Tag: v4.0.0rc1~18
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f31d6d9485542fe86b6ea146386ea204d44cdb5c;p=ceph-ansible.git

update: enable new nautilus-only functionality

once the cluster is upgraded to nautilus, we can complete the process by
disallowing pre-nautilus OSDs and enabling all new nautilus-only functionality

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index f74b5ae87..994bc051a 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -796,6 +796,27 @@
     - import_role:
         name: ceph-client
 
+- name: complete upgrade
+  hosts:
+    - all
+  become: True
+  tasks:
+    - import_role:
+        name: ceph-defaults
+    - import_role:
+        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"
+      delegate_to: "{{ groups[mon_group_name][0] }}"
+      run_once: True
+      when: containerized_deployment
+
+    - name: non container | disallow pre-nautilus OSDs and enable all new nautilus-only functionality
+      command: ceph osd require-osd-release nautilus
+      delegate_to: "{{ groups[mon_group_name][0] }}"
+      run_once: True
+      when: not containerized_deployment
 
     - name: container | enable msgr2 protocol
       command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph mon enable-msgr2"