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

Fix unused network_interfaces parameter

Browse source 
When using the boto_ec2.instance_present state module,
network_interfaces parameter was not used.
This commit is contained in:
Alex Zeleznikov 2018-04-23 19:49:32 +03:00
parent 1ece61ddfa
commit 03ee0023eb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/boto_ec2.py
View file

@ -56,6 +56,7 @@ import salt.utils.data
import salt.utils.json
import salt.utils.versions
from salt.ext import six
from salt.ext.six.moves import map
from salt.exceptions import SaltInvocationError, CommandExecutionError
# Import third party libs
@ -1004,9 +1005,9 @@ def run(image_id, name=None, tags=None, key_name=None, security_groups=None,
return False
security_group_ids += [r]
network_interface_args = map(int, [network_interface_id is not None,
network_interface_name is not None,
network_interfaces is not None])
network_interface_args = list(map(int, [network_interface_id is not None,
network_interface_name is not None,
network_interfaces is not None]))
if sum(network_interface_args) > 1:
raise SaltInvocationError('Only one of network_interface_id, '
@ -1035,7 +1036,7 @@ def run(image_id, name=None, tags=None, key_name=None, security_groups=None,
device_index=0)
if network_interfaces:
interfaces_specs = map(lambda x: NetworkInterfaceSpecification(**x), network_interfaces)
interfaces_specs = [NetworkInterfaceSpecification(**x) for x in network_interfaces]
interfaces = NetworkInterfaceCollection(*interfaces_specs)
else:
interfaces = NetworkInterfaceCollection(interface)