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

Fixes #19597

Browse Source
This commit is contained in:
Flavian 2015-01-20 16:44:24 +01:00
parent 2c57d8ba6a
commit b4213edbec
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/cloud/clouds/msazure.py
View File

@ -410,8 +410,16 @@ def show_instance(name, call=None):
)
nodes = list_nodes_full()
salt.utils.cloud.cache_node(nodes[name], __active_provider_name__, __opts__)
return nodes[name]
# Find under which cloud service the name is listed, if any
service_name = None
for service in nodes:
if name in nodes[service]["role_instance_list"]:
service_name = service
break
if service_name is None:
return {}
salt.utils.cloud.cache_node(nodes[service_name], __active_provider_name__, __opts__)
return nodes[service_name]
def show_service(kwargs=None, conn=None, call=None):
@ -601,7 +609,7 @@ def create(vm_):
'''
try:
conn.get_role(service_name, service_name, vm_["name"])
data = show_instance(service_name, call='action')
data = show_instance(vm_["name"], call='action')
if 'url' in data and data['url'] != str(''):
return data['url']
except WindowsAzureMissingResourceError: