openstack
/
devstack
Code Issues Proposed changes

Merge "Make openrc more robust for grenade scenarios"

This commit is contained in:
Jenkins 2017-05-16 14:47:04 +00:00 committed by Gerrit Code Review
parent 3420019d9d 9bfabc68c4
commit 1d638a9b52
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openrc
View File

@ -83,7 +83,12 @@ export OS_AUTH_TYPE=password
# the user/project has access to - including nova, glance, keystone, swift, ...
# We currently recommend using the version 3 *identity api*.
#
export OS_AUTH_URL=$KEYSTONE_AUTH_URI
# If you don't have a working .stackenv, this is the backup possition
KEYSTONE_BACKUP=$SERVICE_PROTOCOL://$SERVICE_HOST:5000
KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_URI:-$KEYSTONE_BACKUP}
export OS_AUTH_URL=${OS_AUTH_URL:-$KEYSTONE_AUTH_URI}
# Currently, in order to use openstackclient with Identity API v3,
# we need to set the domain which the user and project belong to.