From 54404d94e364398dafea93295819d2489c9ace87 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 21 Jul 2014 14:31:24 -0700 Subject: [PATCH] upgrade/dumpling-firefly-x: rename final upgrade yamls; expect quorum The difference is whether we upgrade all at once or each individually. Also, expect a quorum between a mix of dumpling and firefly monitors. Signed-off-by: Sage Weil --- .../{upgrade-mon-osd-mds.yaml => upgrade-by-daemon.yaml} | 8 -------- .../{upgrade-all.yaml => upgrade-by-type.yaml} | 4 ---- 2 files changed, 12 deletions(-) rename suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/{upgrade-mon-osd-mds.yaml => upgrade-by-daemon.yaml} (76%) rename suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/{upgrade-all.yaml => upgrade-by-type.yaml} (82%) diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml similarity index 76% rename from suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml rename to suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml index ffcfa34023c86..6170563cf0f91 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml @@ -3,26 +3,18 @@ upgrade-sequence: - install.upgrade: mon.a: - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" -# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line -# branch: firefly - install.upgrade: mon.b: - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" -# branch: firefly - install.upgrade: client.0: - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" -# branch: firefly - ceph.restart: daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: 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] diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml similarity index 82% rename from suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml rename to suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml index b239079c533bf..aba8474b7a6a1 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml @@ -3,16 +3,12 @@ upgrade-sequence: - install.upgrade: mon.a: - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" -# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line -# branch: firefly - install.upgrade: mon.b: - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" -# branch: firefly - install.upgrade: client.0: - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" -# branch: firefly - ceph.restart: daemons: [mon.a, mon.b, mon.c] wait-for-healthy: true -- 2.39.5