summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscottb <sydtech@gmail.com>2016-10-28 14:42:26 -0700
committerGitHub <noreply@github.com>2016-10-28 14:42:26 -0700
commitf9fada7db09d48cc721738e0444d8f2cfd0a9e1c (patch)
treeb03e0c3cfe1733823c53850dfe18aac419510d1b
parentde7ec946e9d1cdb636f172b4ec9aeff7e07191d4 (diff)
parent1163b4bb50f369e43765c5699b8866db2938f4bb (diff)
downloadansible-modules-core-f9fada7db09d48cc721738e0444d8f2cfd0a9e1c.tar.gz
Merge pull request #5407 from chrrrles/devel
adding id: back to documentation fixes #2280
-rw-r--r--cloud/amazon/ec2.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index f2407c7a..0b921c4b 100644
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -29,6 +29,13 @@ options:
required: false
default: null
aliases: ['keypair']
+ id:
+ version_added: "1.1"
+ description:
+ - identifier for this instance or set of instances, so that the module will be idempotent with respect to EC2 instances. This identifier is valid for at least 24 hours after the termination of the instance, and should not be reused for another call later on. For details, see the description of client token at U(http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html).
+ required: false
+ default: null
+ aliases: []
group:
description:
- security group (or list of groups) to use with the instance