From 729c03ed88189756ae3b35bdda74285e637653b7 Mon Sep 17 00:00:00 2001 From: Lorin Hochstein 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. --- library/cloud/ec2 | 8 ++++---- library/cloud/s3 | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/library/cloud/ec2 b/library/cloud/ec2 index 6d68435ed61..45b2e3d6483 100644 --- a/library/cloud/ec2 +++ b/library/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/library/cloud/s3 b/library/cloud/s3 index 7ef9b1d71d0..37fdcabaae3 100644 --- a/library/cloud/s3 +++ b/library/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 '''