devstack: provide a default for OS_CLOUD

Not having it breaks the inspector grenade job.

Change-Id: I7ee28a85cb2005dd69e6711b301cd029b8ca40cc

1 files changed, 0 insertions, 12 deletions

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index b4c4533a0..7798001c3 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -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: