diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2021-11-18 11:52:30 -0800 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2021-11-19 08:22:22 -0800 |
| commit | 350c2f7a50c94b72863f0a02b50c22340844ec1c (patch) | |
| tree | f217d167febe2e270d3902444e80dc1673efc8ee /zuul.d | |
| parent | f90b5a6c11d6db53a65d85807959b8ab9b97c602 (diff) | |
| download | ironic-350c2f7a50c94b72863f0a02b50c22340844ec1c.tar.gz | |
CI: Fix devstack plugin with RBAC changes
Changes a neutron call to be project scoped as system
scoped can't create a resource and, and removes the unset
which no longer makes sense now that
I86ffa9cd52454f1c1c72d29b3a0e0caa3e44b829
has merged removing the legacy vars from devstack.
Also renames intenral use setting of OS_CLOUD to IRONIC_OS_CLOUD
as some services were still working with system scope or some sort
of mixed state occuring previously as some of the environment variables
were present still, however they have been removed from devstack.
This change *does* explicitly set an OS_CLOUD variable as well on
the base ironic job. This is because things like grenade for Xena
will expect the variable to be present.
Depends-On: https://review.opendev.org/c/openstack/devstack/+/818449
Change-Id: I912527d7396a9c6d8ee7e90f0c3fd84461d443c1
Diffstat (limited to 'zuul.d')
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index bc7ea7910..ee25c61b6 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -64,6 +64,13 @@ # causes us an abnormally high job failure rate due to the ports # not being found (as neutron crashed on initailization). Q_USE_SECGROUP: False + # NOTE(TheJulia): Project scoped admin as of Yoga cycle + # the core devstack code doesn't assert any environment variables + # upfront except for OS_CLOUd, which is defaulted to devstack-admin + # in the last keystone step which executes after ironic's base setup + # occurs. We navigate this just fine for yoga with fixes, however + # we need this variable for Xena and possibly Wallaby grenade. + OS_CLOUD: devstack-admin devstack_plugins: ironic: https://opendev.org/openstack/ironic tempest_plugins: @@ -854,6 +861,11 @@ SWIFT_TEMPURL_KEY: secretkey EBTABLES_RACE_FIX: True LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images + # NOTE(TheJulia): For now, not all services are aware + # of SRBAC and devstack changes have occured which + # delay this being set until after ironic's initial + # setup. + OS_CLOUD: devstack-admin old: IRONIC_VM_LOG_DIR: '{{ devstack_bases.old }}/ironic-bm-logs' grenade_localrc: |