summaryrefslogtreecommitdiffstats
path: root/qa
diff options
context:
space:
mode:
authorCasey Bodley <cbodley@users.noreply.github.com>2025-01-09 17:03:50 +0100
committerGitHub <noreply@github.com>2025-01-09 17:03:50 +0100
commit46a6f8e001c23e54d324e69751bc2fdf751779aa (patch)
treefab99da7dd8b849b165f7063e9c1eac1f90844c7 /qa
parentMerge pull request #59960 from smanjara/wip-fix-missing-http-data (diff)
parentqa/rgw: set api_name if not provided in create_zonegroup (diff)
downloadceph-46a6f8e001c23e54d324e69751bc2fdf751779aa.tar.xz
ceph-46a6f8e001c23e54d324e69751bc2fdf751779aa.zip
Merge pull request #52791 from clwluvw/location-constraint
rgw: check for location constraint on master zonegroup Reviewed-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'qa')
-rw-r--r--qa/tasks/rgw_multisite.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/tasks/rgw_multisite.py b/qa/tasks/rgw_multisite.py
index e83a54efc2b..f93ca017fa2 100644
--- a/qa/tasks/rgw_multisite.py
+++ b/qa/tasks/rgw_multisite.py
@@ -361,6 +361,8 @@ def create_zonegroup(cluster, gateways, period, config):
if endpoints:
# replace client names with their gateway endpoints
config['endpoints'] = extract_gateway_endpoints(gateways, endpoints)
+ if not config.get('api_name'): # otherwise it will be set to an empty string
+ config['api_name'] = config['name']
zonegroup = multisite.ZoneGroup(config['name'], period)
# `zonegroup set` needs --default on command line, and 'is_master' in json
args = is_default_arg(config)