Skip to content
Browse files

Merge pull request #134 from harlowja/master

More fixes for ec2 variables not working
  • Loading branch information...
2 parents ca59acc + 95e909c commit 0c4b2be2f05398d28cd712c5f9d908f0bdce0177 @harlowja harlowja committed Mar 22, 2012
Showing with 5 additions and 3 deletions.
  1. +5 −3 devstack/env_rc.py
View
8 devstack/env_rc.py
@@ -39,7 +39,8 @@
'ADMIN_PASSWORD': 'horizon_keystone_admin',
'SERVICE_PASSWORD': 'service_password',
'RABBIT_PASSWORD': 'rabbit',
- 'SERVICE_TOKEN': 'service_token',
+ # https://bugs.launchpad.net/keystone/+bug/962600
+ # 'SERVICE_TOKEN': 'service_token',
'MYSQL_PASSWORD': 'sql',
}
@@ -190,9 +191,10 @@ def _get_os_envs(self):
return to_set
def _get_misc_envs(self):
- #key_params = keystone.get_shared_params(self.cfg, self.pw_gen)
to_set = dict()
- #to_set.update(key_params)
+ # https://bugs.launchpad.net/keystone/+bug/962600
+ # key_params = keystone.get_shared_params(self.cfg, self.pw_gen)
+ # to_set.update(key_params)
return to_set
def _generate_misc_env(self):

0 comments on commit 0c4b2be

Please sign in to comment.
Something went wrong with that request. Please try again.