From 3276f8f67b13e6075bc5bcbb0dbde68fcb2aab1c Mon Sep 17 00:00:00 2001 From: tamil Date: Tue, 30 Sep 2014 17:20:01 -0700 Subject: [PATCH] fixed firefly-x and dumpling-firefly-x Signed-off-by: tamil --- .../5-upgrade-sequence/upgrade-by-daemon.yaml | 45 ++++++++++--------- .../5-upgrade-sequence/upgrade-by-type.yaml | 38 ---------------- .../1-firefly-install/emperor-firefly.yaml | 15 ------- .../{dumpling.yaml => firefly.yaml} | 4 +- .../upgrade-mon-osd-mds.yaml | 44 +++++++++--------- 5 files changed, 49 insertions(+), 97 deletions(-) delete mode 100644 suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml delete mode 100644 suites/upgrade/firefly-x/parallel/1-firefly-install/emperor-firefly.yaml rename suites/upgrade/firefly-x/parallel/1-firefly-install/{dumpling.yaml => firefly.yaml} (70%) diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml index 23726b83646..fced4801e52 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml @@ -3,33 +3,36 @@ upgrade-sequence: - install.upgrade: mon.a: - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" + - ceph.restart: + daemons: [mon.a] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.0, osd.1] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.b: + - ceph osd crush tunables giant - install.upgrade: mon.b: - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" - ceph.restart: - daemons: [mon.a] + daemons: [mon.b, mon.c] + wait-for-healthy: true - sleep: duration: 60 - ceph.restart: - daemons: [mon.b] + daemons: [osd.2, osd.3] + wait-for-healthy: true - sleep: duration: 60 - - ceph.restart: [mon.c] - - sleep: - duration: 60 - - ceph.restart: [osd.0] - - sleep: - duration: 60 - - ceph.restart: [osd.1] - - sleep: - duration: 60 - - ceph.restart: [osd.2] - - sleep: - duration: 60 - - ceph.restart: [osd.3] - - sleep: - duration: 60 - - ceph.restart: [mds.a] - - exec: - mon.a: - - ceph osd crush tunables firefly + - install.upgrade: + client.0: + - print: "*** client.0 upgraded" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml deleted file mode 100644 index 179f52e4a66..00000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml +++ /dev/null @@ -1,38 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.0, osd.1] - wait-for-healthy: true - - sleep: - duration: 60 - - print: "**** running mixed versions of osds and mons" - - exec: - mon.a: - - ceph osd crush tunables firefly - - install.upgrade: - mon.b: - - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" - - ceph.restart: - daemons: [mon.b, mon.c] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.2, osd.3] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - exec: - mon.a: - - ceph osd crush tunables firefly diff --git a/suites/upgrade/firefly-x/parallel/1-firefly-install/emperor-firefly.yaml b/suites/upgrade/firefly-x/parallel/1-firefly-install/emperor-firefly.yaml deleted file mode 100644 index e98d77a72b9..00000000000 --- a/suites/upgrade/firefly-x/parallel/1-firefly-install/emperor-firefly.yaml +++ /dev/null @@ -1,15 +0,0 @@ -tasks: -- install: - branch: emperor -- print: "**** done emperor install" -- ceph: - fs: xfs -- print: "**** done ceph" -- install.upgrade: - all: - branch: firefly -- ceph.restart: -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" diff --git a/suites/upgrade/firefly-x/parallel/1-firefly-install/dumpling.yaml b/suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml similarity index 70% rename from suites/upgrade/firefly-x/parallel/1-firefly-install/dumpling.yaml rename to suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml index adbdedee518..9f281319604 100644 --- a/suites/upgrade/firefly-x/parallel/1-firefly-install/dumpling.yaml +++ b/suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml @@ -1,7 +1,7 @@ tasks: - install: - branch: dumpling -- print: "**** done install" + branch: firefly +- print: "**** done installing firefly" - ceph: fs: xfs - print: "**** done ceph" diff --git a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index fcb61b1cef2..9e24e180f22 100644 --- a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,32 +2,34 @@ upgrade-sequence: sequential: - install.upgrade: mon.a: - mon.b: + - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" - ceph.restart: daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true + wait-for-healthy: true - sleep: duration: 60 - ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true - - sleep: - duration: 60 - - ceph.restart: [mon.c] - - sleep: - duration: 60 - - ceph.restart: [osd.0] - - sleep: - duration: 60 - - ceph.restart: [osd.1] - - sleep: - duration: 60 - - ceph.restart: [osd.2] - - sleep: - duration: 60 - - ceph.restart: [osd.3] + daemons: [osd.0, osd.1] + wait-for-healthy: true - sleep: duration: 60 - ceph.restart: [mds.a] + - sleep: + duration: 60 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.b: + - ceph osd crush tunables giant + - install.upgrade: + mon.b: + - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" + - ceph.restart: + daemons: [mon.b, mon.c] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.2, osd.3] + wait-for-healthy: true + - sleep: + duration: 60