mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Fix user:password strings
This commit is contained in:
parent
fbf66af349
commit
7fbc658710
@ -106,7 +106,7 @@ def avail_images(call=None):
|
||||
)
|
||||
|
||||
server, user, password = _get_xml_rpc()
|
||||
auth = user+':'+password
|
||||
auth = ':'.join([user, password])
|
||||
image_pool = server.one.imagepool.info(auth, -1, -1, -1)[1]
|
||||
|
||||
images = {}
|
||||
@ -139,7 +139,7 @@ def avail_locations(call=None):
|
||||
)
|
||||
|
||||
server, user, password = _get_xml_rpc()
|
||||
auth = user+':'+password
|
||||
auth = ':'.join([user, password])
|
||||
host_pool = server.one.hostpool.info(auth)[1]
|
||||
|
||||
locations = {}
|
||||
@ -547,7 +547,7 @@ def destroy(name, call=None):
|
||||
)
|
||||
|
||||
server, user, password = _get_xml_rpc()
|
||||
auth = user+':'+password
|
||||
auth = ':'.join([user, password])
|
||||
|
||||
data = show_instance(name, call='action')
|
||||
node = server.one.vm.action(auth, 'delete', int(data['id']))
|
||||
@ -689,7 +689,7 @@ def _list_nodes(full=False):
|
||||
this parameter to ``True``.
|
||||
'''
|
||||
server, user, password = _get_xml_rpc()
|
||||
auth = user+':'+password
|
||||
auth = ':'.join([user, password])
|
||||
|
||||
vm_pool = server.one.vmpool.info(auth, -1, -1, -1, -1)[1]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user