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