From 214b4407aaf873dd5999dec0f02d3a6fefb41a5e Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Tue, 22 Jan 2019 15:13:03 -0600 Subject: [PATCH] Adding digital_ocean_space alias for s3_bucket module (#39774) * Adding digital_ocean_space alias for s3_bucket module * skipping alias to see if doc-build test passes * undoing last change * removing symlink * oops -- readding module ref * removing more of my changes * removing unneeded doc line * correcting another mistake --- lib/ansible/modules/cloud/amazon/s3_bucket.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/s3_bucket.py b/lib/ansible/modules/cloud/amazon/s3_bucket.py index 07f49cc9e4..053ae99f23 100644 --- a/lib/ansible/modules/cloud/amazon/s3_bucket.py +++ b/lib/ansible/modules/cloud/amazon/s3_bucket.py @@ -21,9 +21,9 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: s3_bucket -short_description: Manage S3 buckets in AWS, Ceph, Walrus and FakeS3 +short_description: Manage S3 buckets in AWS, DigitalOcean, Ceph, Walrus and FakeS3 description: - - Manage S3 buckets in AWS, Ceph, Walrus and FakeS3 + - Manage S3 buckets in AWS, DigitalOcean, Ceph, Walrus and FakeS3 version_added: "2.0" requirements: [ boto3 ] author: "Rob White (@wimnat)" @@ -43,7 +43,7 @@ options: - The JSON policy as a string. s3_url: description: - - S3 URL endpoint for usage with Ceph, Eucalyptus and fakes3 etc. + - S3 URL endpoint for usage with DigitalOcean, Ceph, Eucalyptus and fakes3 etc. - Assumes AWS if not specified. - For Walrus, use FQDN of the endpoint without scheme nor path. aliases: [ S3_URL ] @@ -111,6 +111,11 @@ EXAMPLES = ''' example: tag1 another: tag2 +# Create a simple DigitalOcean Spaces bucket using their provided regional endpoint +- s3_bucket: + name: mydobucket + s3_url: 'https://nyc3.digitaloceanspaces.com' + ''' import json