diff options
| author | Brandon Davidson <brad@oatmail.org> | 2017-05-16 13:46:28 -0700 |
|---|---|---|
| committer | Ryan Brown <sb@ryansb.com> | 2017-05-16 16:46:28 -0400 |
| commit | 0210a1a7dcac326352c9816ad9dc2b6b7cd61b1c (patch) | |
| tree | 1f564845ddd8ffd86f18272ac59b264420164678 | |
| parent | cf4806d29d8a713a5aca011e2e5ddf7594ea598e (diff) | |
| download | ansible-0210a1a7dcac326352c9816ad9dc2b6b7cd61b1c.tar.gz | |
[cloud] Add vpc_id option for ec2_lc security group lookups by name (#24459)
| -rw-r--r-- | lib/ansible/modules/cloud/amazon/ec2_lc.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/ansible/modules/cloud/amazon/ec2_lc.py b/lib/ansible/modules/cloud/amazon/ec2_lc.py index 1839f813af..7723717553 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_lc.py +++ b/lib/ansible/modules/cloud/amazon/ec2_lc.py @@ -121,6 +121,11 @@ options: - A list of security group id's with which to associate the ClassicLink VPC instances. required: false version_added: "2.0" + vpc_id: + description: + - VPC ID, used when resolving security group names to IDs. + required: false + version_added: "2.4" extends_documentation_fragment: - aws - ec2 @@ -189,8 +194,9 @@ def create_launch_config(connection, module): name = module.params.get('name') image_id = module.params.get('image_id') key_name = module.params.get('key_name') + vpc_id = module.params.get('vpc_id') try: - security_groups = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), ec2_connect(module), vpc_id=None, boto3=False) + security_groups = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), ec2_connect(module), vpc_id=vpc_id, boto3=False) except ValueError as e: module.fail_json(msg=str(e)) user_data = module.params.get('user_data') @@ -319,7 +325,8 @@ def main(): instance_monitoring=dict(default=False, type='bool'), assign_public_ip=dict(type='bool'), classic_link_vpc_security_groups=dict(type='list'), - classic_link_vpc_id=dict(type='str') + classic_link_vpc_id=dict(type='str'), + vpc_id=dict(type='str') ) ) |