KEYSTONE_SERVICE_API is the keystone endpoint and it is what we should
use. The admin url should DIAF - but until it does, it CERTAINLY should
not be the thing we put into clouds.yaml.
Change-Id: If8196a04f852f633e0b7548793f68c92376aa6da
... | ... |
@@ -93,7 +93,7 @@ function write_clouds_yaml { |
93 | 93 |
--os-region-name $REGION_NAME \ |
94 | 94 |
--os-identity-api-version 3 \ |
95 | 95 |
$CA_CERT_ARG \ |
96 |
- --os-auth-url $KEYSTONE_AUTH_URI \ |
|
96 |
+ --os-auth-url $KEYSTONE_SERVICE_URI \ |
|
97 | 97 |
--os-username demo \ |
98 | 98 |
--os-password $ADMIN_PASSWORD \ |
99 | 99 |
--os-project-name demo |
... | ... |
@@ -105,7 +105,7 @@ function write_clouds_yaml { |
105 | 105 |
--os-region-name $REGION_NAME \ |
106 | 106 |
--os-identity-api-version 3 \ |
107 | 107 |
$CA_CERT_ARG \ |
108 |
- --os-auth-url $KEYSTONE_AUTH_URI \ |
|
108 |
+ --os-auth-url $KEYSTONE_SERVICE_URI \ |
|
109 | 109 |
--os-username alt_demo \ |
110 | 110 |
--os-password $ADMIN_PASSWORD \ |
111 | 111 |
--os-project-name alt_demo |
... | ... |
@@ -117,7 +117,7 @@ function write_clouds_yaml { |
117 | 117 |
--os-region-name $REGION_NAME \ |
118 | 118 |
--os-identity-api-version 3 \ |
119 | 119 |
$CA_CERT_ARG \ |
120 |
- --os-auth-url $KEYSTONE_AUTH_URI \ |
|
120 |
+ --os-auth-url $KEYSTONE_SERVICE_URI \ |
|
121 | 121 |
--os-username admin \ |
122 | 122 |
--os-password $ADMIN_PASSWORD \ |
123 | 123 |
--os-project-name admin |