openstack/devstack
Code Issues Proposed changes

Merge "Add devstack-admin cloud to clouds.yaml"

Browse Source
This commit is contained in:
Jenkins 2015-06-25 12:11:38 +00:00 committed by Gerrit Code Review
commit c782781a4c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stack.sh
View File

@ -1296,8 +1296,9 @@ fi
save_stackenv save_stackenv
# Update/create user clouds.yaml file. # Update/create user clouds.yaml file.
# clouds.yaml will have a `devstack` entry for the `demo` user for the `demo` # clouds.yaml will have
# project. # - A `devstack` entry for the `demo` user for the `demo` project.
# - A `devstack-admin` entry for the `admin` user for the `admin` project.
# The location is a variable to allow for easier refactoring later to make it # The location is a variable to allow for easier refactoring later to make it
# overridable. There is currently no usecase where doing so makes sense, so # overridable. There is currently no usecase where doing so makes sense, so
@ -1320,6 +1321,16 @@ $TOP_DIR/tools/update_clouds_yaml.py \
--os-username demo \ --os-username demo \
--os-password $ADMIN_PASSWORD \ --os-password $ADMIN_PASSWORD \
--os-project-name demo --os-project-name demo
$TOP_DIR/tools/update_clouds_yaml.py \
--file $CLOUDS_YAML \
--os-cloud devstack-admin \
--os-region-name $REGION_NAME \
--os-identity-api-version $IDENTITY_API_VERSION \
$CA_CERT_ARG \
--os-auth-url $KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION \
--os-username admin \
--os-password $ADMIN_PASSWORD \
--os-project-name admin
# Wrapup configuration # Wrapup configuration