Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

ec2_lc EC2 Classic fix. #583

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions cloud/amazon/ec2_lc.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
description:
- Used for Auto Scaling groups that launch instances into an Amazon Virtual Private Cloud. Specifies whether to assign a public IP address to each instance launched in a Amazon VPC.
required: false
default: false
default: None
aliases: []
version_added: "1.8"
ramdisk_id:
Expand Down Expand Up @@ -177,13 +177,20 @@ def create_launch_config(connection, module):
instance_type = module.params.get('instance_type')
spot_price = module.params.get('spot_price')
instance_monitoring = module.params.get('instance_monitoring')
assign_public_ip = module.params.get('assign_public_ip')
kernel_id = module.params.get('kernel_id')
ramdisk_id = module.params.get('ramdisk_id')
instance_profile_name = module.params.get('instance_profile_name')
ebs_optimized = module.params.get('ebs_optimized')
bdm = BlockDeviceMapping()

if module.params.get('assign_public_ip'):
if module.params.get('assign_public_ip') == 'yes':
assign_public_ip = True
else:
assign_public_ip = False
else:
assign_public_ip = None

if volumes:
for volume in volumes:
if 'device_name' not in volume:
Expand Down Expand Up @@ -253,9 +260,8 @@ def main():
ramdisk_id=dict(type='str'),
instance_profile_name=dict(type='str'),
ebs_optimized=dict(default=False, type='bool'),
associate_public_ip_address=dict(type='bool'),
instance_monitoring=dict(default=False, type='bool'),
assign_public_ip=dict(default=False, type='bool')
assign_public_ip=dict(default=None, choices=['yes','no'])
)
)

Expand Down