x/tuskar-ui
Code Issues Proposed changes

Merge "Setup swift endpoint correctly"

Browse Source
This commit is contained in:
Jenkins 2014-10-10 15:09:50 +00:00 committed by Gerrit Code Review
commit 6574a5fd15
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tuskar_ui/infrastructure/overview/forms.py
View File

@ -265,7 +265,9 @@ class PostDeployInit(horizon.forms.SelfHandlingForm):
controller_role.parameter_prefix + 'NovaPassword')}, controller_role.parameter_prefix + 'NovaPassword')},
"swift": { "swift": {
"password": plan.parameter_value( "password": plan.parameter_value(
controller_role.parameter_prefix + 'SwiftPassword')}, controller_role.parameter_prefix + 'SwiftPassword'),
'path': '/v1/AUTH_%(tenant_id)s',
'admin_path': '/v1'},
"horizon": {'port': ''}} "horizon": {'port': ''}}
def build_neutron_setup(self, data): def build_neutron_setup(self, data):

4
tuskar_ui/infrastructure/overview/tests.py
View File

@ -283,7 +283,9 @@ class OverviewTests(test.BaseAdminViewTests):
'horizon': {'port': ''}, 'horizon': {'port': ''},
'cinder': {'password': None}, 'cinder': {'password': None},
'glance': {'password': None}, 'glance': {'password': None},
'swift': {'password': None}, 'swift': {'password': None,
'path': '/v1/AUTH_%(tenant_id)s',
'admin_path': '/v1'},
'novav3': {'password': None}, 'novav3': {'password': None},
'neutron': {'password': None}}, 'neutron': {'password': None}},
os_auth_url=stack.keystone_auth_url, os_auth_url=stack.keystone_auth_url,