From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Nov 2016 21:58:20 +0000 (-0400)
Subject: upgrade/jewel-x/point-to-point: fix upgrades
X-Git-Tag: v11.1.1~58^2^2~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2faef4e6befd993085fed391086cdca436dc193;p=ceph.git

upgrade/jewel-x/point-to-point: fix upgrades

skip ceph-mgr

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

diff --git a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 731b167e5278..802b1dbd1628 100644
--- a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -54,8 +54,10 @@ tasks:
 - install.upgrade:
     mon.a:
       branch: jewel
+      exclude_packages: ['ceph-mgr']
     mon.b:
       branch: jewel
+      exclude_packages: ['ceph-mgr']
     # Note that client.a IS NOT upgraded at this point
     #client.1:
       #branch: jewel
@@ -64,14 +66,13 @@ tasks:
    - upgrade-sequence_jewel
 - print: "**** done parallel jewel branch"
 - install.upgrade:
-   client.1:
-     branch: jewel
+    client.1:
+      branch: jewel
+      exclude_packages: ['ceph-mgr']
 - print: "**** done branch: jewel install.upgrade on client.1"
 - install.upgrade:
-   mon.a:
-     #branch: jewel
-   mon.b:
-     #branch: jewel
+    mon.a:
+    mon.b:
 - print: "**** done branch: -x install.upgrade on mon.a and mon.b"
 - parallel:
    - workload_x