upgrade: do not start second radosgw

Use the first one.  This verifies bobtail radosgw works against cuttlefish
osds.

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 1867babd2cdfdba68a3a3e30dc31a6d82be041e4..4bd7ad87b0966110c423b9251a8e56f6ac54bc52 100644 (file)
--- 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 684ee0bc258babb08d92a5a580d36a92aa57d755..5487d39cab3dad1b00a77e6be6b565e9d236affd 100644 (file)
--- 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 2d1ba44c570c4ce3407e31de25ae42909c6ad1a2..15d4122c5b3648953d15e9300d61e4a7a379d0bd 100644 (file)
--- 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 90c79095cc4fd9f5b1a27a4eba966dccff5e763e..c0e7d2a2f950fcfdf33fcddbc838373cb9794402 100644 (file)
--- 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 3d345395e09602c064c40e11459df1e934631f19..19b9e7485e4d5b22f13b73e01b776994ce1ba3d9 100644 (file)
--- 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 3469b87bb971c6c4a90cf5255d2bc409d9a4f961..b684fff2f152810cf175423f48eb2defef52c799 100644 (file)
--- 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