Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
Vlad Glagolev 2015-09-22 17:46:05 +03:00
commit 5ce05474bd

View file

@ -53,7 +53,7 @@ options:
required: true required: true
tags: tags:
description: description:
- "A dictionary array of resource tags of the form: { tag1: value1, tag2: value2 }. Tags in this list are used to uniquely identify route tables within a VPC when the route_table_id is not supplied." - "A dictionary of resource tags of the form: { tag1: value1, tag2: value2 }. Tags are used to uniquely identify route tables within a VPC when the route_table_id is not supplied."
required: false required: false
default: null default: null
aliases: [ "resource_tags" ] aliases: [ "resource_tags" ]
@ -89,7 +89,7 @@ EXAMPLES = '''
vpc_id: vpc-1245678 vpc_id: vpc-1245678
region: us-west-1 region: us-west-1
tags: tags:
- Name: Internal Name: Internal
subnets: subnets:
- "{{ application_subnet.subnet_id }}" - "{{ application_subnet.subnet_id }}"
- 'Database Subnet' - 'Database Subnet'