From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 1 Jun 2022 18:10:24 +0000 (-0400)
Subject: test/rgw/multisite: enable zonegroup resharding feature
X-Git-Tag: v18.0.0~787^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39002%2Fhead;p=ceph.git

test/rgw/multisite: enable zonegroup resharding feature

qa/tasks/rgw_multisite.py uses 'zonegroup set' to create zonegroups from
their json format. this doesn't enable any of the supported zonegroup
features by default, so this adds the 'enabled_features' field to the
json representations

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml
index 4d93e7ad0e4e..c329a879a8f7 100644
--- a/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml
+++ b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml
@@ -8,6 +8,7 @@ overrides:
         is_master: true
         is_default: true
         endpoints: [c1.client.0]
+        enabled_features: ['resharding']
         zones:
           - name: test-zone1
             is_master: true
diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
index b78bb107055d..02710a7d9dd6 100644
--- a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
+++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
@@ -8,6 +8,7 @@ overrides:
         is_master: true
         is_default: true
         endpoints: [c1.client.0]
+        enabled_features: ['resharding']
         zones:
           - name: a1
             is_master: true
@@ -18,6 +19,7 @@ overrides:
       - name: b
         is_default: true
         endpoints: [c2.client.0]
+        enabled_features: ['resharding']
         zones:
           - name: b1
             is_master: true