All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit b8eb31b9 authored by David Johnson's avatar David Johnson

Add an env var for gnocchi client (to use openstack password auth).

gnocchi client just doesn't default to this, I guess.  Don't know if
it's safe in general for all the other releases, so only set it for
queens and on.
parent f01d129f
......@@ -721,6 +721,9 @@ fi
if [ $OSVERSION -ge $OSNEWTON ]; then
echo "export OS_IMAGE_API_VERSION=2" >> $OURDIR/admin-openrc-newcli.sh
fi
if [ $OSVERSION -ge $OSQUEENS ]; then
echo "OS_AUTH_TYPE=password" >> $OURDIR/admin-openrc-newcli.sh
fi
if [ "x$KEYSTONEAPIVERSION" = "x3" ]; then
if [ $OSVERSION -lt $OSMITAKA ]; then
......@@ -744,6 +747,9 @@ fi
if [ $OSVERSION -ge $OSNEWTON ]; then
echo "OS_IMAGE_API_VERSION=2" >> $OURDIR/admin-openrc-newcli.py
fi
if [ $OSVERSION -ge $OSQUEENS ]; then
echo "OS_AUTH_TYPE='password'" >> $OURDIR/admin-openrc-newcli.py
fi
#
# From here on out, we need to be the adminapi user.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment