cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3772 from lorin/s3-docpatch

Browse source 
Minor doc update to s3 & ec2 modules
This commit is contained in:
Michael DeHaan 2013-08-06 13:30:20 -07:00
commit 0b4e145709
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/cloud/ec2
View file

@ -105,16 +105,16 @@ options:
aliases: [] aliases: []
ec2_secret_key: ec2_secret_key:
description: description:
- ec2 secret key - EC2 secret key. If not specified then the EC2_SECRET_KEY environment variable is used.
required: false required: false
default: null default: null
aliases: [] aliases: [ EC2_SECRET_KEY ]
ec2_access_key: ec2_access_key:
description: description:
- ec2 access key - EC2 access key. If not specified then the EC2_ACCESS_KEY environment variable is used.
required: false required: false
default: null default: null
aliases: [] aliases: [ EC2_ACCESS_KEY ]
count: count:
description: description:
- number of instances to launch - number of instances to launch

17
library/cloud/s3
View file

@ -67,6 +67,23 @@ options:
required: false required: false
default: null default: null
aliases: [] 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" ] requirements: [ "boto" ]
author: Lester Wade, Ralph Tice author: Lester Wade, Ralph Tice
''' '''