From 76f02b8dd148300d289bdf68fcf461c1074fa5dd Mon Sep 17 00:00:00 2001 From: Joshua Harlow <harlowja@yahoo-inc.com> Date: Thu, 22 Mar 2012 17:15:45 -0700 Subject: [PATCH] Just unset these for euca ec2 tasks --- devstack/env_rc.py | 3 +-- euca.sh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/env_rc.py b/devstack/env_rc.py index 316a4043..7a015d3f 100644 --- a/devstack/env_rc.py +++ b/devstack/env_rc.py @@ -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', } diff --git a/euca.sh b/euca.sh index 3e46cb99..0f9d296d 100755 --- a/euca.sh +++ b/euca.sh @@ -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