mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix ec2_lc failing to create multi-volume configurations (#32163)
This commit is contained in:
parent
ca71a50459
commit
87989b5c63
1 changed files with 3 additions and 3 deletions
6
lib/ansible/modules/cloud/amazon/ec2_lc.py
Normal file → Executable file
6
lib/ansible/modules/cloud/amazon/ec2_lc.py
Normal file → Executable file
|
@ -254,7 +254,7 @@ def create_launch_config(connection, module):
|
||||||
classic_link_vpc_id = module.params.get('classic_link_vpc_id')
|
classic_link_vpc_id = module.params.get('classic_link_vpc_id')
|
||||||
classic_link_vpc_security_groups = module.params.get('classic_link_vpc_security_groups')
|
classic_link_vpc_security_groups = module.params.get('classic_link_vpc_security_groups')
|
||||||
|
|
||||||
block_device_mapping = {}
|
block_device_mapping = []
|
||||||
|
|
||||||
convert_list = ['image_id', 'instance_type', 'instance_type', 'instance_id', 'placement_tenancy', 'key_name', 'kernel_id', 'ramdisk_id', 'spot_price']
|
convert_list = ['image_id', 'instance_type', 'instance_type', 'instance_id', 'placement_tenancy', 'key_name', 'kernel_id', 'ramdisk_id', 'spot_price']
|
||||||
|
|
||||||
|
@ -273,7 +273,7 @@ def create_launch_config(connection, module):
|
||||||
module.fail_json(msg='Device name must be set for volume')
|
module.fail_json(msg='Device name must be set for volume')
|
||||||
# Minimum volume size is 1GB. We'll use volume size explicitly set to 0 to be a signal not to create this volume
|
# Minimum volume size is 1GB. We'll use volume size explicitly set to 0 to be a signal not to create this volume
|
||||||
if 'volume_size' not in volume or int(volume['volume_size']) > 0:
|
if 'volume_size' not in volume or int(volume['volume_size']) > 0:
|
||||||
block_device_mapping.update(create_block_device_meta(module, volume))
|
block_device_mapping.append(create_block_device_meta(module, volume))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
|
launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
|
||||||
|
@ -298,7 +298,7 @@ def create_launch_config(connection, module):
|
||||||
launch_config['ClassicLinkVPCSecurityGroups'] = classic_link_vpc_security_groups
|
launch_config['ClassicLinkVPCSecurityGroups'] = classic_link_vpc_security_groups
|
||||||
|
|
||||||
if block_device_mapping:
|
if block_device_mapping:
|
||||||
launch_config['BlockDeviceMappings'] = [block_device_mapping]
|
launch_config['BlockDeviceMappings'] = block_device_mapping
|
||||||
|
|
||||||
if instance_profile_name is not None:
|
if instance_profile_name is not None:
|
||||||
launch_config['IamInstanceProfile'] = instance_profile_name
|
launch_config['IamInstanceProfile'] = instance_profile_name
|
||||||
|
|
Loading…
Reference in a new issue