From 5744afeb5bdba4fb0115dd9747bf343d80788cec Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 26 Apr 2013 17:12:55 -0700 Subject: [PATCH] upgrade: do not start second radosgw Use the first one. This verifies bobtail radosgw works against cuttlefish osds. --- suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml | 1 - suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml | 1 - suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml | 1 - .../upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml | 1 - suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml | 1 - .../upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml | 1 - 6 files changed, 6 deletions(-) diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml index 1867babd2cd..4bd7ad87b09 100644 --- a/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- rgw: [client.0] - swift: client.0: rgw_server: client.0 diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml index 684ee0bc258..5487d39cab3 100644 --- a/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] -- rgw: [client.0] - s3tests: client.0: rgw_server: client.0 diff --git a/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml index 2d1ba44c570..15d4122c5b3 100644 --- a/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- rgw: [client.0] - swift: client.0: rgw_server: client.0 diff --git a/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml b/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml index 90c79095cc4..c0e7d2a2f95 100644 --- a/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- rgw: [client.0] - s3readwrite: client.0: rgw_server: client.0 diff --git a/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml index 3d345395e09..19b9e7485e4 100644 --- a/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] -- rgw: [client.0] - swift: client.0: rgw_server: client.0 diff --git a/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml b/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml index 3469b87bb97..b684fff2f15 100644 --- a/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml +++ b/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml @@ -20,7 +20,6 @@ tasks: all: branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- rgw: [client.0] - s3readwrite: client.0: rgw_server: client.0