Merge pull request ceph#52494 from alimaredia/wip-rgw-crypt-keystone-fix

qa: fix keystone in rgw/crypt/barbican.yaml

Reviewed-by: Ali Maredia <amaredia@redhat.com>

Author: alimaredia

qa/suites/rgw/crypt/2-kms/barbican.yaml

@@ -27,7 +27,11 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      force-branch: stable/xena
+      force-branch: stable/2023.1
+      services:
+        - name: swift
+          type: object-store
+          description: Swift Service
       projects:
         - name: rgwcrypt
           description: Encryption Tenant
@@ -62,10 +66,6 @@ tasks:
         - name: creator
           user: s3-user
           project: s3
-      services:
-        - name: swift
-          type: object-store
-          description: Swift Service
 - barbican:
     client.0:
       force-branch: stable/xena

qa/suites/rgw/crypt/supported-random-distro$

@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_latest.yaml

qa/suites/rgw/crypt/ubuntu_latest.yaml

@@ -136,9 +136,8 @@ def set_authtoken_params(ctx, cclient, cconfig):
                         ['sed', '-i',
                          '/[[]filter:authtoken]/{p;s##'+'auth_uri = {}'.format(url)+'#;}',
                          'etc/barbican/barbican-api-paste.ini'])
-    admin_host, admin_port = ctx.keystone.admin_endpoints[keystone_role]
-    admin_url = 'http://{host}:{port}/v3'.format(host=admin_host,
-                                                 port=admin_port)
+    admin_url = 'http://{host}:{port}/v3'.format(host=public_host,
+                                                 port=public_port)
     run_in_barbican_dir(ctx, cclient,
                         ['sed', '-i',
                          '/[[]filter:authtoken]/{p;s##'+'auth_url = {}'.format(admin_url)+'#;}',