summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2014-01-16 04:18:49 +0100
committerMichael DeHaan <michael.dehaan@gmail.com>2014-01-16 04:18:49 +0100
commit87e7b9e5cc56a108049d6abd6f5acd1bec1f259c (patch)
treea1fbaefd4431823870451df28469e7b5e6b11b2a
parentMerge pull request #5636 from sivel/rax-no-log (diff)
parentec2_elb module: Minor improvements to documentation (diff)
downloadansible-87e7b9e5cc56a108049d6abd6f5acd1bec1f259c.tar.xz
ansible-87e7b9e5cc56a108049d6abd6f5acd1bec1f259c.zip
Merge pull request #5640 from willthames/ec2_elb_docs
ec2_elb module: Minor improvements to documentation
-rw-r--r--library/cloud/ec2_elb5
1 files changed, 3 insertions, 2 deletions
diff --git a/library/cloud/ec2_elb b/library/cloud/ec2_elb
index 4488cf8460..6a8a25986e 100644
--- a/library/cloud/ec2_elb
+++ b/library/cloud/ec2_elb
@@ -17,9 +17,9 @@
DOCUMENTATION = """
---
module: ec2_elb
-short_description: De-registers or registers instances from EC2 ELB(s)
+short_description: De-registers or registers instances from EC2 ELBs
description:
- - This module de-registers or registers an AWS EC2 instance from the ELB(s)
+ - This module de-registers or registers an AWS EC2 instance from the ELBs
that it belongs to.
- Returns fact "ec2_elbs" which is a list of elbs attached to the instance
if state=absent is passed as an argument.
@@ -32,6 +32,7 @@ options:
description:
- register or deregister the instance
required: true
+ choices: ['present', 'absent']
instance_id:
description: