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

ec2 network_interfaces fix

Browse Source
This commit is contained in:
joseph.gimenez@peoplematter.com 2015-06-25 19:19:48 -04:00
parent f65e663353
commit 7a393df080
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1152,10 +1152,17 @@ def _create_eni_if_necessary(interface):
for subnet_query_result in subnet_query:
if 'item' in subnet_query_result:
for subnet in subnet_query_result['item']:
if subnet['subnetId'] == interface['SubnetId']:
found = True
break
if type(subnet_query_result['item']) is dict:
for key, value in subnet_query_result['item'].iteritems():
if key == "subnetId":
if value == interface['SubnetId']:
found = True
break
else:
for subnet in subnet_query_result['item']:
if subnet['subnetId'] == interface['SubnetId']:
found = True
break
if not found:
raise SaltCloudConfigError(