valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow passing connection_args through non-profile methods

Browse Source
This commit is contained in:
Adam Smith 2014-06-27 09:22:02 +10:00
parent 34d1f358c6
commit 3d0179201c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/keystone.py
View File

@ -288,7 +288,7 @@ def endpoint_create(service, publicurl=None, internalurl=None, adminurl=None,
salt '*' keystone.endpoint_create nova 'http://public/url'
'http://internal/url' 'http://adminurl/url' region
'''
kstone = auth(profile)
kstone = auth(profile, **connection_args)
keystone_service = service_get(name=service, **connection_args)
if not keystone_service or 'Error' in keystone_service:
return {'Error': 'Could not find the specified service'}
@ -310,7 +310,7 @@ def endpoint_delete(service, profile=None, **connection_args):
salt '*' keystone.endpoint_delete nova
'''
kstone = auth(profile)
kstone = auth(profile, **connection_args)
endpoint = endpoint_get(service, profile, **connection_args)
if not endpoint or 'Error' in endpoint:
return {'Error': 'Could not find any endpoints for the service'}