x/anvil
Code Issues Proposed changes

Merge pull request #135 from harlowja/master

Browse Source 
Re-add and just unset in euca.sh
This commit is contained in:
Joshua Harlow 2012-03-22 19:28:58 -07:00
commit 42c6cdc3b8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/env_rc.py
View File

@ -39,8 +39,7 @@ PASSWORDS_MAKES = {
'ADMIN_PASSWORD': 'horizon_keystone_admin',
'SERVICE_PASSWORD': 'service_password',
'RABBIT_PASSWORD': 'rabbit',
# https://bugs.launchpad.net/keystone/+bug/962600
# 'SERVICE_TOKEN': 'service_token',
'SERVICE_TOKEN': 'service_token',
'MYSQL_PASSWORD': 'sql',
}

4
euca.sh
View File

@ -28,6 +28,10 @@ fi
# Get user configuration
source $CORE_RC
# Bug https://bugs.launchpad.net/keystone/+bug/962600
unset SERVICE_TOKEN
unset SERVICE_ENDPOINT
# Now we start showing whats happening
set -x