openstack/devstack
Code Issues Proposed changes

Merge "Keystone updates"

Browse Source
This commit is contained in:
Jenkins 2012-01-26 01:32:43 +00:00 committed by Gerrit Code Review
commit fa436aa228
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -1291,6 +1291,10 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g; s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g;
s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g; s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
" -i $KEYSTONE_DATA " -i $KEYSTONE_DATA
# Prepare up the database
$KEYSTONE_DIR/bin/keystone-manage sync_database
# initialize keystone with default users/endpoints # initialize keystone with default users/endpoints
ENABLED_SERVICES=$ENABLED_SERVICES BIN_DIR=$KEYSTONE_DIR/bin bash $KEYSTONE_DATA ENABLED_SERVICES=$ENABLED_SERVICES BIN_DIR=$KEYSTONE_DIR/bin bash $KEYSTONE_DATA

2
stackrc
View File

@ -16,7 +16,7 @@ GLANCE_BRANCH=master
# unified auth system (manages accounts/tokens) # unified auth system (manages accounts/tokens)
KEYSTONE_REPO=https://github.com/openstack/keystone.git KEYSTONE_REPO=https://github.com/openstack/keystone.git
KEYSTONE_BRANCH=stable/diablo KEYSTONE_BRANCH=master
# a websockets/html5 or flash powered VNC console for vm instances # a websockets/html5 or flash powered VNC console for vm instances
NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git