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

Added vm_ to the get_location query.

Browse source
This commit is contained in:
Ruxandra Burtica 2015-12-24 11:41:30 +02:00 • committed by rallytime
parent af8d01a367
commit 129a6d7b9f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1209,7 +1209,7 @@ def block_device_mappings(vm_):
)
def _request_eip(interface, vm_=None):
def _request_eip(interface, vm_):
'''
Request and return Elastic IP
'''
@ -1707,7 +1707,7 @@ def request_instance(vm_=None, call=None):
eni_devices = []
for interface in network_interfaces:
log.debug('Create network interface: {0}'.format(interface))
_new_eni = _create_eni_if_necessary(interface)
_new_eni = _create_eni_if_necessary(interface, vm_)
eni_devices.append(_new_eni)
params.update(_param_from_config(spot_prefix + 'NetworkInterface',
eni_devices))
@ -1748,7 +1748,7 @@ def request_instance(vm_=None, call=None):
}
try:
rd_data = aws.query(rd_params,
location=get_location(),
location=get_location(vm_),
provider=get_provider(),
opts=__opts__,
sigver='4')