x/anvil
Code Issues Proposed changes

Be more clear about the passwords exported, and use the demo one in the demo creation

Browse Source
This commit is contained in:
Joshua Harlow 2012-09-11 17:29:09 -07:00
parent 995dfb7af3
commit 0ed0c4afd2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
anvil/components/keystone.py
View File

@ -102,8 +102,13 @@ class KeystoneInstaller(comp.PythonInstallComponent):
khelper.get_shared_passwords(self)))
to_set = OrderedDict()
to_set['OS_PASSWORD'] = params['admin_password']
to_set['OS_TENANT_NAME'] = params['demo_tenant']
to_set['OS_USERNAME'] = params['demo_user']
to_set['OS_TENANT_NAME'] = params['admin_tenant']
to_set['OS_USERNAME'] = params['admin_user']
to_set['DEMO_OS_PASSWORD'] = params['demo_password']
to_set['DEMO_OS_TENANT_NAME'] = params['demo_tenant']
to_set['DEMO_OS_USERNAME'] = params['demo_user']
to_set['OS_AUTH_URL'] = params['endpoints']['public']['uri']
to_set['SERVICE_ENDPOINT'] = params['endpoints']['admin']['uri']
for (endpoint, details) in params['endpoints'].items():

2
conf/templates/keystone/init_what.yaml
View File

@ -91,7 +91,7 @@ tenants:
users:
- email: demo@example.com
name: demo
password: '$keystone.admin_password'
password: '$keystone.demo_password'
roles:
- anotherrole:demo
- Member:demo