From cc0e9b18170bc796fd8516e41d2ec09236b168aa Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Wed, 25 Oct 2023 13:13:26 -0700 Subject: [PATCH] Switch Neutron RBAC flag in testing Neutron bobcat release has enabled the RBAC new defaults by default. With the latest release of Neutron have new defaults enable and devstack (depends on) made NEUTRON_ENFORCE_SCOPE flag to True by default. Tempst need to switch the flag too so that we test new RBAC by default and old RBAC in old RBAC job. Depends-On: https://review.opendev.org/c/openstack/devstack/+/899306 Change-Id: I81c4dc11b16f27d6f074e84ff54363e7b415e5b3 --- zuul.d/integrated-gate.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml index 9181182dab..4b4306c61e 100644 --- a/zuul.d/integrated-gate.yaml +++ b/zuul.d/integrated-gate.yaml @@ -396,11 +396,6 @@ parent: tempest-full-py3 description: | This job runs the Tempest tests with scope and new defaults enabled. - # TODO: remove this once https://review.opendev.org/c/openstack/neutron-lib/+/864213 - # fix is released in neutron-lib - required-projects: - - openstack/neutron-lib - - openstack/neutron vars: devstack_localrc: # Enabeling the scope and new defaults for services. @@ -410,10 +405,9 @@ # Keystone policies are changed to work for both system as well as # for project scoped, we need to keep scope check disable for # keystone. - # Nova and Glance have enabled the new defaults and scope by default - # in devstack. + # Nova, Glance, and Neutron have enabled the new defaults and scope + # by default in devstack. CINDER_ENFORCE_SCOPE: true - NEUTRON_ENFORCE_SCOPE: true PLACEMENT_ENFORCE_SCOPE: true - job: @@ -421,12 +415,14 @@ parent: tempest-all description: | Integration test that runs all tests on RBAC old defaults. + vars: devstack_localrc: - # NOTE(gmann): Nova and Glance have enabled the new defaults and scope - # by default in devstack so we need some jobs keep testing the old - # defaults until they are removed from service side. + # NOTE(gmann): Nova, Glance, and Neutron have enabled the new defaults + # and scope by default in devstack so we need some jobs keep testing + # the old defaults until they are removed from service side. NOVA_ENFORCE_SCOPE: false GLANCE_ENFORCE_SCOPE: false + NEUTRON_ENFORCE_SCOPE: false - project-template: name: integrated-gate-networking