2
0

Merge pull request #242 from irtnog/add-s3fs-support

Add support for s3fs
This commit is contained in:
Brian Jackson 2016-07-12 15:43:54 -07:00 committed by GitHub
commit 15d39babb6
2 changed files with 53 additions and 0 deletions

View File

@ -20,10 +20,18 @@ salt:
master: master:
fileserver_backend: fileserver_backend:
- git - git
- s3fs
- roots - roots
gitfs_remotes: gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git: - git://github.com/saltstack-formulas/salt-formula.git:
- base: develop - base: develop
s3.keyid: GKTADJGHEIQSXMKKRBJ08H
s3.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
s3.buckets:
- bucket1
- bucket2
- bucket3
- bucket4
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

View File

@ -859,6 +859,51 @@ gitfs_env_blacklist:
# - feature/* # - feature/*
{% endif %} {% 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 ##### ##### Pillar settings #####
########################################## ##########################################
# Salt Pillars allow for the building of global data that can be made selectively # Salt Pillars allow for the building of global data that can be made selectively