cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renamed vpc_id_tags to resource_tags

Browse source
This commit is contained in:
Alexander Popov 2014-03-05 10:32:51 -05:00
parent 514e4b3742
commit 49e9c42770
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/cloud/ec2_vpc
View file

@ -56,7 +56,7 @@ options:
required: false required: false
default: null default: null
aliases: [] aliases: []
vpc_id_tags: resource_tags:
description: description:
- A list of tags uniquely identifying a VPC in the form of: {Tag1: Value1, Tag2: Value2, ...}. This list works in conjunction with CIDR (cidr_block) and is gnored when VPC id (vpc_id) is specified. - A list of tags uniquely identifying a VPC in the form of: {Tag1: Value1, Tag2: Value2, ...}. This list works in conjunction with CIDR (cidr_block) and is gnored when VPC id (vpc_id) is specified.
required: false required: false
@ -133,7 +133,7 @@ EXAMPLES = '''
module: ec2_vpc module: ec2_vpc
state: present state: present
cidr_block: 172.23.0.0/16 cidr_block: 172.23.0.0/16
vpc_id_tags: { "Environment":"Development" } resource_tags: { "Environment":"Development" }
region: us-west-2 region: us-west-2
# Full creation example with subnets and optional availability zones. # Full creation example with subnets and optional availability zones.
# The absence or presense of subnets deletes or creates them respectively. # The absence or presense of subnets deletes or creates them respectively.
@ -141,7 +141,7 @@ EXAMPLES = '''
module: ec2_vpc module: ec2_vpc
state: present state: present
cidr_block: 172.22.0.0/16 cidr_block: 172.22.0.0/16
vpc_id_tags: { "Environment":"Development" } resource_tags: { "Environment":"Development" }
subnets: subnets:
- cidr: 172.22.1.0/24 - cidr: 172.22.1.0/24
az: us-west-2c az: us-west-2c
@ -219,7 +219,7 @@ def find_vpc(module, vpc_conn, vpc_id=None, cidr=None):
found_vpcs = [] found_vpcs = []
vpc_id_tags = module.params.get('vpc_id_tags') resource_tags = module.params.get('resource_tags')
# Check for existing VPC by cidr_block or id # Check for existing VPC by cidr_block or id
if vpc_id is not None: if vpc_id is not None:
@ -233,7 +233,7 @@ def find_vpc(module, vpc_conn, vpc_id=None, cidr=None):
vpc_tags = dict((t.name, t.value) for t in vpc_conn.get_all_tags(filters={'resource-id': vpc.id})) vpc_tags = dict((t.name, t.value) for t in vpc_conn.get_all_tags(filters={'resource-id': vpc.id}))
# If the supplied list of ID Tags match a subset of the VPC Tags, we found our VPC # If the supplied list of ID Tags match a subset of the VPC Tags, we found our VPC
if set(vpc_id_tags.items()).issubset(set(vpc_tags.items())): if set(resource_tags.items()).issubset(set(vpc_tags.items())):
found_vpcs.append(vpc) found_vpcs.append(vpc)
found_vpc = None found_vpc = None
@ -531,7 +531,7 @@ def main():
dns_hostnames = dict(choices=BOOLEANS, default=True), dns_hostnames = dict(choices=BOOLEANS, default=True),
subnets = dict(type='list'), subnets = dict(type='list'),
vpc_id = dict(), vpc_id = dict(),
vpc_id_tags = dict(type='dict'), resource_tags = dict(type='dict'),
internet_gateway = dict(choices=BOOLEANS, default=False), internet_gateway = dict(choices=BOOLEANS, default=False),
route_tables = dict(type='list'), route_tables = dict(type='list'),
state = dict(choices=['present', 'absent'], default='present'), state = dict(choices=['present', 'absent'], default='present'),