Merge remote-tracking branch 'abadger/feature/s3-region' into devel
Conflicts: library/cloud/s3
This commit is contained in:
commit
af47d8dc42
1 changed files with 1 additions and 1 deletions
2
cloud/s3
2
cloud/s3
|
@ -91,7 +91,7 @@ options:
|
||||||
version_added: "1.6"
|
version_added: "1.6"
|
||||||
region:
|
region:
|
||||||
description:
|
description:
|
||||||
- AWS region to create the bucket in. If not set then the value of the EC2_REGION and AWS_REGION environment variables are checked, followed by the aws_region and ec2_region settings in the Boto config file. If none of those are set the region defaults to the S3 Location: US Standard. Prior to ansible 1.8 this parameter could be specified but did nothing.
|
- AWS region to create the bucket in. If not set then the value of the EC2_REGION and AWS_REGION environment variables are checked, followed by the aws_region and ec2_region settings in the Boto config file. If none of those are set the region defaults to the S3 Location: US Standard. Prior to ansible 1.8 this parameter could be specified but had no effect.
|
||||||
required: false
|
required: false
|
||||||
default: null
|
default: null
|
||||||
version_added: "1.8"
|
version_added: "1.8"
|
||||||
|
|
Loading…
Reference in a new issue