From 43b2116adb92e5fbe945b53edd115edadd73a016 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 18 May 2023 20:08:55 -0500 Subject: [PATCH] Test glance RBAC old defaults Glance has enabled the scope checks and new defaults in antelope release and now devstack is switching the testing to new defaults by default (depends-on). With that all the jobs will run the the new defaults. As old defaults are still supported (as deprecated), we should test those at least in a single integrated job. Enable the old defaults in glance-multistore-cinder-import job. Keeping existing job enabling the new defaults because other services have not switched to new defaults yet to this job enable new defaults for those service and test Glance against that. Depends-On: https://review.opendev.org/c/openstack/devstack/+/883601/ Change-Id: I470e3b8c1106d88e85343508a8e5891c88861c98 --- .zuul.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 70cfafbcee..b184e0cca0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -245,6 +245,9 @@ GLANCE_ENABLE_MULTIPLE_STORES: True CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2 GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1 + # Glance RBAC new defaults are tested by default so we need to test + # old defaults in some job. + GLANCE_ENFORCE_SCOPE: false - job: name: glance-multistore-cinder-import-fips @@ -299,9 +302,9 @@ Glance services. vars: devstack_localrc: - NOVA_ENFORCE_SCOPE: true + # Nova and glance scope and new defaults are enabled by default in + # Devstack so we do not need to explicitly set that to True. CINDER_ENFORCE_SCOPE: true - GLANCE_ENFORCE_SCOPE: true - project: templates: