openstack
/
python-muranoclient
Code Issues Proposed changes

Replacing application_catalog with application-catalog 

Murano does not get keystone endpoint when Keystone is configured to use
templated catalog

Change-Id: Ib99e649f4e2dc750043ee025fd56d2fef8486a8c
Closes-bug: #1514692
Depends-On: Id568c0a59b2e99dc946b1f2f55f6b233fd6a1b27
This commit is contained in:
liyingjun 2015-11-13 14:04:55 +08:00 committed by Ekaterina Chernova
parent e546bdd18e
commit 4b4d828be0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranoclient/shell.py
View File

@ -422,7 +422,7 @@ class MuranoShell(object):
project_domain_name=args.os_project_domain_name)
endpoint_type = args.os_endpoint_type or 'publicURL'
service_type = args.os_service_type or 'application_catalog'
service_type = args.os_service_type or 'application-catalog'
if not endpoint:
endpoint = keystone_auth.get_endpoint(

4
muranoclient/tests/unit/test_shell.py
View File

@ -140,7 +140,7 @@ class ShellCommandTest(ShellTest):
def register_keystone_token_fixture(self, mreq):
v2_token = ks_v2_fixture.Token(token_id='token')
service = v2_token.add_service('application_catalog')
service = v2_token.add_service('application-catalog')
service.add_endpoint('http://no.where', region='RegionOne')
mreq.register_uri('POST',
'http://no.where/v2.0/tokens',
@ -1208,7 +1208,7 @@ class ShellPackagesOperationsV3(ShellPackagesOperations):
def register_keystone_token_fixture(self, mreq):
v3_token = ks_v3_fixture.Token()
service = v3_token.add_service('application_catalog')
service = v3_token.add_service('application-catalog')
service.add_standard_endpoints(public='http://no.where')
mreq.register_uri('POST',
'http://no.where/v3/auth/tokens',