From 202259ae5705ba747c7d28d62f54094fe0fb0d3b Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Thu, 9 Oct 2014 13:24:53 -0700 Subject: [PATCH] Fixed upgrade steps flow Signed-off-by: Yuri Weinstein --- .../parallel/3-upgrade-sequence/upgrade-all.yaml | 4 ++++ .../parallel/4-firefly-upgrade/firefly.yaml | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml index a0b3d360312..5d1f60b6e6d 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -2,5 +2,9 @@ upgrade-sequence0: sequential: - install.upgrade: mon.a: + branch: firefly mon.b: + branch: firefly + - print: "**** done install.upgrade firefly for mon.a and mon.b" - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] + - print: "**** done ceph.restart the cluster" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml index 4e925d0972a..ac8a53c50aa 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml @@ -1,14 +1,4 @@ tasks: - - install.upgrade: - mon.a: - branch: firefly - mon.b: - branch: firefly - client.0: - branch: firefly - - print: "**** done install.upgrade" - - ceph.restart: - - print: "**** done restart" - parallel: - workload2 - upgrade-sequence