Merge pull request #5312 from willthames/ec2_tag_enforce_state

Make state=present the default for ec2_tag
pull/5329/head
Michael DeHaan 11 years ago
commit f8c197ba24

@ -31,8 +31,9 @@ options:
state: state:
description: description:
- Whether the tags should be present or absent on the resource. - Whether the tags should be present or absent on the resource.
required: true required: false
default: null default: present
choices: ['present', 'absent']
aliases: [] aliases: []
region: region:
description: description:
@ -116,7 +117,7 @@ def main():
resource = dict(required=True), resource = dict(required=True),
tags = dict(required=True), tags = dict(required=True),
region = dict(aliases=['aws_region', 'ec2_region'], choices=AWS_REGIONS), region = dict(aliases=['aws_region', 'ec2_region'], choices=AWS_REGIONS),
state = dict(choices=['present', 'absent']), state = dict(default='present', choices=['present', 'absent']),
ec2_url = dict(aliases=['EC2_URL']), ec2_url = dict(aliases=['EC2_URL']),
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True), ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key']), ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),

Loading…
Cancel
Save