Skip to content

Commit

Permalink
removed docs related to iam and s3.
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewsmedina committed Apr 28, 2014
1 parent 6d93010 commit f0c2495
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 51 deletions.
52 changes: 2 additions & 50 deletions docs/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,12 @@ optional, and defaults to "unlimited".
Amazon Web Services (AWS) configuration
---------------------------------------

tsuru is able to use Amazon Web Services (AWS) Simple Storage Service (S3) to
provide static storage for apps. Whenever ``bucket-support`` is true, tsuru
will create a S3 bucket and AWS Identity and Access Management (IAM)
credentials to access this bucket during the app creation process. In order to
tsuru is able to use Amazon Web Services (AWS). In order to
be able to communicate with AWS API's, tsuru needs some settings, listed below.

For more details on AWS authentication, AWS AIM and AWS S3, check AWS docs:
For more details on AWS authentication, check AWS docs:
https://aws.amazon.com/documentation/.

bucket-support
++++++++++++++

``bucket-support`` is a boolean flag, that turns on the bucket per app feature.
This field is optional, and defaults to false.

aws:access-key-id
+++++++++++++++++

Expand All @@ -242,45 +233,6 @@ aws:ec2:endpoint
``aws:ec2:endpoint`` is the EC2 endpoint that tsuru will call to communicate
with ec2. It's only used for `juju` healers.

aws:iam:endpoint
++++++++++++++++

``aws:iam:endpoint`` is the IAM endpoint that tsuru will call to create
credentials for its applications. This setting is optional, and defaults to
``https://iam.amazonaws.com/``. You should change this setting only when using
another service that also implements IAM's API.

aws:s3:region-name
++++++++++++++++++

``aws:s3:region-name`` is the name of the region that tsuru will use to create
S3 buckets. Given that ``bucket-support`` is true, this setting is required and
has no default value.

aws:s3:endpoint
+++++++++++++++

``aws:s3:endpoint`` is the S3 endpoint that tsuru will call to create buckets
for its applications. Given that ``bucket-support`` is true, this setting is
required and has no default value.

aws:s3:location-constraint
++++++++++++++++++++++++++

``aws:s3:location-constraint`` indicates whether buckets should be stored in
the selected region. Given that ``bucket-support`` is true, this setting is
required and has no default value.

For more details, check the documentation for buckets and regions:
http://docs.aws.amazon.com/AmazonS3/latest/dev/LocationSelection.html.

aws:s3:lowercase-bucket
+++++++++++++++++++++++

``aws:s3:lowercase-bucket`` will be true if the region requires bucket names to
be lowercase. Given that ``bucket-support`` is true, this setting is required
and has no default value.

queue configuration
-------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/releases/tsr/0.4.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Backwards incompatible changes
==============================

The s3 integration on app creation was removed.
The config properties `bucket-support` and `aws:iam` was removed too.
The config properties `bucket-support`, `aws:iam` `aws:s3` was removed too.

You should use `tsuru` cli 0.9.0 version.

0 comments on commit f0c2495

Please sign in to comment.