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

cloud.clouds.ec2: cache each named node (#33164)

Browse Source
This commit is contained in:
Justin Findlay 2016-05-12 11:16:27 -06:00 committed by Mike Place
parent 86db5df7c1
commit b3805d825a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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