x/anvil
Code Issues Proposed changes

Merge pull request #134 from harlowja/master

Browse Source 
More fixes for ec2 variables not working
This commit is contained in:
Joshua Harlow 2012-03-22 17:00:06 -07:00
commit 0c4b2be2f0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/env_rc.py
View File

@ -39,7 +39,8 @@ PASSWORDS_MAKES = {
'ADMIN_PASSWORD': 'horizon_keystone_admin', 'ADMIN_PASSWORD': 'horizon_keystone_admin',
'SERVICE_PASSWORD': 'service_password', 'SERVICE_PASSWORD': 'service_password',
'RABBIT_PASSWORD': 'rabbit', 'RABBIT_PASSWORD': 'rabbit',
'SERVICE_TOKEN': 'service_token', # https://bugs.launchpad.net/keystone/+bug/962600
# 'SERVICE_TOKEN': 'service_token',
'MYSQL_PASSWORD': 'sql', 'MYSQL_PASSWORD': 'sql',
} }
@ -190,9 +191,10 @@ class RcWriter(object):
return to_set return to_set
def _get_misc_envs(self): def _get_misc_envs(self):
#key_params = keystone.get_shared_params(self.cfg, self.pw_gen)
to_set = dict() 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 return to_set
def _generate_misc_env(self): def _generate_misc_env(self):