From bad8e609733cbd1ec819e5cc3c7ee9a0e735f98f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 23 Feb 2014 19:10:42 -0800 Subject: [PATCH] upgrade/dumpling: upgrade to latest dumpling, not emperor Signed-off-by: Sage Weil --- .../dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml | 2 +- .../dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 2 +- .../dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 2 +- .../dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml | 2 +- .../dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 2 +- .../dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 2 +- .../dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml | 2 +- .../dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 2 +- .../dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 2 +- .../dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml | 2 +- .../dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 2 +- .../dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml index 520dc4b30cf1f..38bba91895d86 100644 --- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml +++ b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mds.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index e11f8c3b13fd3..5b617fdfd5ac3 100644 --- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mon.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index 78cb33be1eca7..91c146a20706b 100644 --- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [osd.0] - sleep: duration: 30 diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml index 520dc4b30cf1f..38bba91895d86 100644 --- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml +++ b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mds.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index e11f8c3b13fd3..5b617fdfd5ac3 100644 --- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mon.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index f0fa4b886c590..801bab9f1f0de 100644 --- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [osd.0] - sleep: duration: 30 diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml index 520dc4b30cf1f..38bba91895d86 100644 --- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml +++ b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mds.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index e11f8c3b13fd3..5b617fdfd5ac3 100644 --- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mon.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index 78cb33be1eca7..91c146a20706b 100644 --- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [osd.0] - sleep: duration: 30 diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml index 0ae6f9280962e..ff9129046e130 100644 --- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml +++ b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mds.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index 3f0aad2ec8693..75face28d8881 100644 --- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [mon.a] - sleep: duration: 60 diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index 622b02d427141..a08c669bf9ef0 100644 --- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -2,7 +2,7 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: emperor + branch: dumpling - ceph.restart: [osd.0] - sleep: duration: 30 -- 2.39.5