saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39784 from sergeizv/fix-39782

Browse source 
Fix 39782
This commit is contained in:
Mike Place 2017-03-02 09:08:50 -07:00 • committed by GitHub
commit c234c25092
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/cloud/clouds/ec2.py
View file

@ -2647,11 +2647,7 @@ def queue_instances(instances):
'''
for instance_id in instances:
node = _get_node(instance_id=instance_id)
for name in node:
if instance_id == node[name]['instanceId']:
__utils__['cloud.cache_node'](node[name],
__active_provider_name__,
__opts__)
__utils__['cloud.cache_node'](node, __active_provider_name__, __opts__)
def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True):
@ -3200,10 +3196,7 @@ def show_instance(name=None, instance_id=None, call=None, kwargs=None):
)
node = _get_node(name=name, instance_id=instance_id)
for name in node:
__utils__['cloud.cache_node'](node[name],
__active_provider_name__,
__opts__)
__utils__['cloud.cache_node'](node, __active_provider_name__, __opts__)
return node