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

Merge pull request #14232 from UtahDave/fix_ec2

Browse Source 
fix keyerror
This commit is contained in:
Seth House 2014-07-15 01:40:12 -06:00
commit c5abea8ea9
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/cloud/clouds/ec2.py
View File

@ -2236,7 +2236,7 @@ def set_tags(name=None,
if resource_id is None:
if instance_id is None:
instance_id = _get_node(name, location)['instanceId']
instance_id = _get_node(name, location)[name]['instanceId']
else:
instance_id = resource_id
@ -2420,7 +2420,7 @@ def destroy(name, call=None):
)
node_metadata = _get_node(name)
instance_id = node_metadata['instanceId']
instance_id = node_metadata[name]['instanceId']
sir_id = node_metadata.get('spotInstanceRequestId')
protected = show_term_protect(
name=name,