openstack
/
ironic
Code Issues Proposed changes

devstack: provide a default for OS_CLOUD 

Not having it breaks the inspector grenade job.

Change-Id: I7ee28a85cb2005dd69e6711b301cd029b8ca40cc
This commit is contained in:
Dmitry Tantsur 2021-12-08 09:45:57 +01:00
parent c0fc88b728
commit b37ee7c911
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -193,6 +193,13 @@ if [[ "$IRONIC_ENFORCE_SCOPE" == "True" ]]; then
else
IRONIC_OS_CLOUD=devstack-admin
fi
# 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=${OS_CLOUD:-devstack-admin}
# Versions and command line for API client
IRONIC_DEFAULT_API_VERSION=${IRONIC_DEFAULT_API_VERSION:-}

12
zuul.d/ironic-jobs.yaml
View File

@ -64,13 +64,6 @@
# 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:
@ -861,11 +854,6 @@
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: