From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 30 Aug 2024 15:21:50 +0000 (-0400)
Subject: qa/rgw/multisite: specify realm/zonegroup/zone args for 'account create'
X-Git-Tag: v20.0.0~1142^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e4157c8e98a9f40c258e10f4e3042956ad3ab549;p=ceph.git

qa/rgw/multisite: specify realm/zonegroup/zone args for 'account create'

in the rgw/multisite suite, jobs fail on user creation:

> radosgw-admin --cluster c1 account create --account-id RGW11111111111111111
> radosgw-admin --cluster c1 user create --uid rgw-multisite-test-user --account-id RGW11111111111111111 --account-root --rgw-zone test-zone1 --rgw-zonegroup test-zonegroup --rgw-realm test-realm --display-name TestUser --gen-access-key --gen-secret
> could not create user: unable to create user, Failed to load account by id

realms/two-zones.yaml misspells `is_default` as `is default` for the
realm, so it doesn't get set as default. the `account create` command
doesn't specify a realm/zonegroup/zone, so operates on the "default"
zone and zonegroup

use `zone_args()` to add the explicit realm/zonegroup/zone arguments

Fixes: https://tracker.ceph.com/issues/67839

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

diff --git a/qa/tasks/rgw_multisite_tests.py b/qa/tasks/rgw_multisite_tests.py
index 822cbcf7910c9..e0a38deadd216 100644
--- a/qa/tasks/rgw_multisite_tests.py
+++ b/qa/tasks/rgw_multisite_tests.py
@@ -72,7 +72,9 @@ class RGWMultisiteTests(Task):
         # create test account/user
         log.info('creating test user..')
         user = multisite.User('rgw-multisite-test-user', account='RGW11111111111111111')
-        master_zone.cluster.admin(['account', 'create', '--account-id', user.account])
+        arg = ['--account-id', user.account]
+        arg += master_zone.zone_args()
+        master_zone.cluster.admin(['account', 'create'] + arg)
         user.create(master_zone, ['--display-name', 'TestUser',
                                   '--gen-access-key', '--gen-secret'])