openstack/devstack
Code Issues Proposed changes

Merge "Use the proper keystone endpoints in clouds.yaml"

Browse Source
This commit is contained in:
Jenkins 2017-05-26 19:24:51 +00:00 committed by Gerrit Code Review
commit 8085df74a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions-common
View File

@ -93,7 +93,7 @@ function write_clouds_yaml {
--os-region-name $REGION_NAME \ --os-region-name $REGION_NAME \
--os-identity-api-version 3 \ --os-identity-api-version 3 \
$CA_CERT_ARG \ $CA_CERT_ARG \
--os-auth-url $KEYSTONE_AUTH_URI \ --os-auth-url $KEYSTONE_SERVICE_URI \
--os-username demo \ --os-username demo \
--os-password $ADMIN_PASSWORD \ --os-password $ADMIN_PASSWORD \
--os-project-name demo --os-project-name demo
@ -105,7 +105,7 @@ function write_clouds_yaml {
--os-region-name $REGION_NAME \ --os-region-name $REGION_NAME \
--os-identity-api-version 3 \ --os-identity-api-version 3 \
$CA_CERT_ARG \ $CA_CERT_ARG \
--os-auth-url $KEYSTONE_AUTH_URI \ --os-auth-url $KEYSTONE_SERVICE_URI \
--os-username alt_demo \ --os-username alt_demo \
--os-password $ADMIN_PASSWORD \ --os-password $ADMIN_PASSWORD \
--os-project-name alt_demo --os-project-name alt_demo
@ -117,7 +117,7 @@ function write_clouds_yaml {
--os-region-name $REGION_NAME \ --os-region-name $REGION_NAME \
--os-identity-api-version 3 \ --os-identity-api-version 3 \
$CA_CERT_ARG \ $CA_CERT_ARG \
--os-auth-url $KEYSTONE_AUTH_URI \ --os-auth-url $KEYSTONE_SERVICE_URI \
--os-username admin \ --os-username admin \
--os-password $ADMIN_PASSWORD \ --os-password $ADMIN_PASSWORD \
--os-project-name admin --os-project-name admin