From bce605d392d1df6bca3605695416f1e5b55959ca Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 Mar 2014 09:27:41 -0800 Subject: [PATCH] upgrade/dumpling-x: do not upgrade client host If we are running against a mixed cluster for the duration of the upgrade, we need to make sure we are running the *old* client tests against the cluster. Do not upgrade client.0. Fixes: #7574 Signed-off-by: Sage Weil --- .../dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 2 ++ .../parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml | 3 ++- .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 3 ++- .../parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 9aebbf50e3692..f5d10cdfcaba8 100644 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -1,4 +1,6 @@ upgrade-sequence: sequential: - install.upgrade: + mon.a: + mon.b: - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml index df65c74e385d5..2cf81f7b3a98c 100644 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml +++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml @@ -1,7 +1,8 @@ upgrade-sequence: sequential: - install.upgrade: - all: + mon.a: + mon.b: - ceph.restart: [mds.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index 25eb6e48413fc..fe9a18c4ee8c7 100644 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -1,7 +1,8 @@ upgrade-sequence: sequential: - install.upgrade: - all: + mon.a: + mon.b: - ceph.restart: daemons: [mon.a] wait-for-healthy: false diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index e497800d547a2..353d805a84c94 100644 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -1,7 +1,8 @@ upgrade-sequence: sequential: - install.upgrade: - all: + mon.a: + mon.b: - ceph.restart: [osd.0] - sleep: duration: 60 -- 2.39.5