valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7585 from drawsmcgraw/develop

Browse Source 
Updated docs to include defining service_url and using 's3fs' in fileser...
This commit is contained in:
Joseph Hall 2013-10-03 08:16:42 -07:00
commit 345a8ea845
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/fileserver/s3fs.py
View File

@ -8,7 +8,7 @@ This backend exposes directories in S3 buckets as Salt environments. This
feature is managed by the :conf_master:`fileserver_backend` option in the Salt feature is managed by the :conf_master:`fileserver_backend` option in the Salt
Master config. Master config.
:configuration: S3 credentials can be either set in the master file using: :configuration:
S3 credentials can be set in the master config file with:: S3 credentials can be set in the master config file with::
@ -18,6 +18,19 @@ Master config.
Alternatively, if on EC2 these credentials can be automatically loaded from Alternatively, if on EC2 these credentials can be automatically loaded from
instance metadata. instance metadata.
You will need to specify the service_url with:
service_url: s3.amazonaws.com
You can find a listing of the S3 enpoints at:
http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
Lastly, include s3fs in your fileserver_backend:
fileserver_backend:
- s3fs
This fileserver supports two modes of operation for the buckets: This fileserver supports two modes of operation for the buckets:
- A single bucket per environment:: - A single bucket per environment::