summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorDmitry Tantsur <dtantsur@protonmail.com>2021-12-08 09:45:57 +0100
committerDmitry Tantsur <dtantsur@protonmail.com>2021-12-08 09:49:26 +0100
commitb37ee7c91133d4970208f14833d8f732de9b5911 (patch)
treeae3607a2dbd0086b1cb5dd5c490c84dba04b474c /devstack
parentc0fc88b7288537dc5391d1de402a36e8df6f7139 (diff)
downloadironic-b37ee7c91133d4970208f14833d8f732de9b5911.tar.gz
devstack: provide a default for OS_CLOUD
Not having it breaks the inspector grenade job. Change-Id: I7ee28a85cb2005dd69e6711b301cd029b8ca40cc
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ironic7
1 files changed, 7 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 0f6cc922e..95aba3c6a 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -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:-}