Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for s3fs #242

Merged
merged 2 commits into from
Jul 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,18 @@ salt:
master:
fileserver_backend:
- git
- s3fs
- roots
gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git:
- base: develop
s3.keyid: GKTADJGHEIQSXMKKRBJ08H
s3.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
s3.buckets:
- bucket1
- bucket2
- bucket3
- bucket4
file_roots:
base:
- /srv/salt
Expand Down
45 changes: 45 additions & 0 deletions salt/files/master.d/f_defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,51 @@ gitfs_env_blacklist:
# - feature/*
{% endif %}

# S3 File Server Backend Configuration
#
# S3 credentials must be set in the master config file.
# Alternatively, if on EC2 these credentials can be automatically
# loaded from instance metadata.
{% if 's3.keyid' in cfg_master -%}
{{ get_config('s3.keyid', '<no default>') }}
{{ get_config('s3.key', '<no default>') }}
{% else -%}
# s3.keyid: GKTADJGHEIQSXMKKRBJ08H
# s3.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
{% endif %}
# This fileserver supports two modes of operation for the buckets:
# - A single bucket per environment
# - Multiple environments per bucket
#
# Note that bucket names must be all lowercase both in the AWS console
# and in Salt, otherwise you may encounter SignatureDoesNotMatch
# errors.
#
# A multiple-environment bucket must adhere to the following root
# directory structure:
#
# s3://<bucket name>/<environment>/<files>
#
# This fileserver back-end requires the use of the MD5 hashing
# algorithm. MD5 may not be compliant with all security policies.
{% if 's3.buckets' in cfg_master -%}
{{ get_config('s3.buckets', '<no default>') }}
{% else -%}
# s3.buckets: #single bucket per environment
# production:
# - bucket1
# - bucket2
# staging:
# - bucket3
# - bucket4
#
# s3.buckets: #multiple environments per bucket
# - bucket1
# - bucket2
# - bucket3
# - bucket4
{% endif %}

##### Pillar settings #####
##########################################
# Salt Pillars allow for the building of global data that can be made selectively
Expand Down