From 2281cb66a320bba61f6d6a66fd012a3bd0d6f465 Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin@nimbisservices.com>
Date: Tue, 6 Aug 2013 12:23:25 -0400
Subject: [PATCH] Minor doc update to s3 & ec2 modules

Adds some additional docs about the module parameters for s3
and ec2 modules.
---
 cloud/ec2 |  8 ++++----
 cloud/s3  | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cloud/ec2 b/cloud/ec2
index 6d68435ed61..45b2e3d6483 100644
--- a/cloud/ec2
+++ b/cloud/ec2
@@ -105,16 +105,16 @@ options:
     aliases: []
   ec2_secret_key:
     description:
-      - ec2 secret key
+      - EC2 secret key. If not specified then the EC2_SECRET_KEY environment variable is used.
     required: false
     default: null
-    aliases: []
+    aliases: [ EC2_SECRET_KEY ]
   ec2_access_key:
     description:
-      - ec2 access key
+      - EC2 access key. If not specified then the EC2_ACCESS_KEY environment variable is used.
     required: false
     default: null
-    aliases: []
+    aliases: [ EC2_ACCESS_KEY ]
   count:
     description:
       - number of instances to launch
diff --git a/cloud/s3 b/cloud/s3
index 7ef9b1d71d0..37fdcabaae3 100644
--- a/cloud/s3
+++ b/cloud/s3
@@ -67,6 +67,23 @@ options:
     required: false
     default: null
     aliases: []
+  s3_url:
+    description:
+        - S3 URL endpoint. If not specified then the S3_URL environment variable is used, if that variable is defined.
+    default: null
+    aliases: [ S3_URL ]
+  ec2_access_key:
+    description:
+      - EC2 access key. If not specified then the EC2_ACCESS_KEY environment variable is used.
+    required: false
+    default: null
+    aliases: [ EC2_ACCESS_KEY ]
+  ec2_secret_key:
+    description:
+      - EC2 secret key. If not specified then the EC2_SECRET_KEY environment variable is used.
+    required: false
+    default: null
+    aliases: [ EC2_SECRET_KEY ]
 requirements: [ "boto" ]
 author: Lester Wade, Ralph Tice
 '''