From: Sage Weil <sage@redhat.com>
Date: Mon, 12 Jun 2017 18:19:02 +0000 (-0400)
Subject: qa/upgrade/jewel-x/point-to-point: add a mgr during final upgrade
X-Git-Tag: v12.1.0~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bc1a25bbe96ddb652c884d57c7c796336df1335;p=ceph.git

qa/upgrade/jewel-x/point-to-point: add a mgr during final upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 736ba19e6235..fd4a1d8f6b7b 100644
--- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -28,6 +28,7 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+  - mgr.x
 - - mon.b
   - mon.c
   - osd.3
@@ -47,6 +48,7 @@ tasks:
 - print: "**** done v10.2.0 install"
 - ceph:
    fs: xfs
+   skip_mgr_daemons: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload
@@ -207,4 +209,17 @@ upgrade-sequence_x:
        daemons: [osd.5]
        wait-for-healthy: false
        wait-for-up-osds: true
+   - exec:
+      mgr.x:
+        - mkdir -p /var/lib/ceph/mgr/ceph-x
+        - ceph auth get-or-create-key mgr.x mon 'allow profile mgr'
+        - ceph auth export mgr.x > /var/lib/ceph/mgr/ceph-x/keyring
+   - ceph.restart:
+       daemons: [mgr.x]
+       wait-for-healthy: false
+   - exec:
+       osd.0:
+         - ceph osd require-osd-release luminous
+         - ceph osd set-require-min-compat-client luminous
+   - ceph.healthy:
    - print: "**** done ceph.restart all -x branch mds/osd/mon"