openstack/devstack
Code Issues Proposed changes

Use the varialbe to export right keystone api version

Browse Source 
Change-Id: I1e8ea2b7173c549065ed1f08814eb4b4bb2f05cd
Fixes: Bug #1217783
This commit is contained in:
Yong Sheng Gong 2013-08-28 17:02:56 +08:00
parent 8db8f38c65
commit 300e1bf276
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openrc
View File

@ -63,21 +63,19 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
# should be listening on HOST_IP. If its running elsewhere, it can be set here # should be listening on HOST_IP. If its running elsewhere, it can be set here
GLANCE_HOST=${GLANCE_HOST:-$HOST_IP} GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
# Identity API version
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-2.0}
# Authenticating against an Openstack cloud using Keystone returns a **Token** # Authenticating against an Openstack cloud using Keystone returns a **Token**
# and **Service Catalog**. The catalog contains the endpoints for all services # and **Service Catalog**. The catalog contains the endpoints for all services
# the user/tenant has access to - including nova, glance, keystone, swift, ... # the user/tenant has access to - including nova, glance, keystone, swift, ...
# We currently recommend using the 2.0 *identity api*. # We currently recommend using the 2.0 *identity api*.
# #
# *NOTE*: Using the 2.0 *identity api* does not mean that compute api is 2.0. We export OS_AUTH_URL=$SERVICE_PROTOCOL://$SERVICE_HOST:5000/v${OS_IDENTITY_API_VERSION}
# will use the 1.1 *compute api*
export OS_AUTH_URL=$SERVICE_PROTOCOL://$SERVICE_HOST:5000/v2.0
# Set the pointer to our CA certificate chain. Harmless if TLS is not used. # Set the pointer to our CA certificate chain. Harmless if TLS is not used.
export OS_CACERT=$INT_CA_DIR/ca-chain.pem export OS_CACERT=$INT_CA_DIR/ca-chain.pem
# Identity API version
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-2.0}
# Currently novaclient needs you to specify the *compute api* version. This # Currently novaclient needs you to specify the *compute api* version. This
# needs to match the config of your catalog returned by Keystone. # needs to match the config of your catalog returned by Keystone.
export NOVA_VERSION=${NOVA_VERSION:-1.1} export NOVA_VERSION=${NOVA_VERSION:-1.1}