Forrest
2a80f55a17
Merge pull request #249 from msciciel/salt-master-yaml-utf8
Add yaml_utf8 option to salt master configuration.
pirms 8 gadiem
Krzysztof Pawłowski
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
pirms 8 gadiem
Forrest
5dd3eac097
Merge pull request #247 from mrichar1/other_opts
Handle config opts not part of default config.
pirms 8 gadiem
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
pirms 8 gadiem
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
pirms 8 gadiem
Niels Abspoel
39a329b693
Merge pull request #245 from UGNS/raspbian
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
pirms 8 gadiem
Jeremy T. Bouse
3b265a544a
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
Rasbian reports back the following grain values:
local:
----------
os:
Raspbian
os_family:
Debian
osarch:
armhf
osmajorrelease:
8
osrelease:
8.0
Ubuntu reports back the following grain values:
local:
----------
os:
Ubuntu
os_family:
Debian
osarch:
amd64
osmajorrelease:
14
osrelease:
14.04
For Raspbian the osarch needed to be changed from other Debain os_family
distributions.
For Ubuntu the osrelease value is needed instead of osmajorrelease as other
Debian os_family distributions.
Part of #180
pirms 8 gadiem
Forrest
8050f6cf95
Merge pull request #243 from pcdummy/master
https for the ubuntu repo and option to remove /etc/salt/minion.
pirms 8 gadiem
Rene Jochum
f17b8f5424
Add optional method to remove /etc/salt/master.
Signed-off-by: Rene Jochum <rene@jochums.at>
pirms 8 gadiem
Rene Jochum
1b611c871e
Add optional method to remove /etc/salt/minion.
Signed-off-by: Rene Jochum <rene@jochums.at>
pirms 8 gadiem
Rene Jochum
fa6818af35
Use https for the Ubuntu repo same as salt-bootstrap.
Signed-off-by: Rene Jochum <rene@jochums.at>
pirms 8 gadiem
Brian Jackson
15d39babb6
Merge pull request #242 from irtnog/add-s3fs-support
Add support for s3fs
pirms 8 gadiem
Matthew X. Economou
d7be9aba9f
Document sample s3fs configuration
pirms 8 gadiem
Matthew X. Economou
12390494cf
Add support for s3fs
pirms 8 gadiem
Forrest
55864f7cdf
Merge pull request #241 from pcdummy/mongodb
add support for mongodb settings
pirms 8 gadiem
Rene Jochum
6ae81a9640
Add support for mongodb connection settings to config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
pirms 8 gadiem
Rene Jochum
478fef683b
Remove trailing whitespaces in config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
pirms 8 gadiem
Forrest
e1b664f4d3
Merge pull request #240 from mwpher/master
Add support for OpenBSD in map.jinja
pirms 8 gadiem
Matthew Pherigo
621e1f218c
Add support for OpenBSD in map.jinja
pirms 8 gadiem
Forrest
5f03ce9db1
Merge pull request #234 from rhertzog/pkgrepo-update
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
pirms 8 gadiem
Forrest
137868bcc1
Merge pull request #237 from msonawane/master
add module_config for minions
pirms 8 gadiem
Manoj Sonawane
98d591eab2
add module_config for minions
pirms 8 gadiem
Forrest
6b96bda5cd
Merge pull request #235 from rhertzog/master-config-fix
JSON encode values embedded in the salt-master's configuration file
pirms 8 gadiem
Raphaël Hertzog
ee06702fca
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
repo.saltstack.com handles all currently supported Debian releases as well
as all supported Ubuntu releases so this change should be fine.
Part of #180 .
pirms 8 gadiem
Raphaël Hertzog
182098fc16
JSON encode values embedded in the salt-master's configuration file
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.
Fixes #233 .
pirms 8 gadiem
Forrest
a96f7093fb
Merge pull request #226 from Sjd-Risca/lxcprofile
Lxcprofile
pirms 8 gadiem
risca
ca42d40ef9
added support for LXC profiles
pirms 8 gadiem
Forrest
3bc5aa3bce
Merge pull request #231 from rocket-labs-sysadmins/master
GitPython package name is fixed for RedHat-based OS
pirms 8 gadiem
kabakaev
f16e012687
Merge pull request #1 from TiagoTT/patch-1
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
pirms 8 gadiem
Tiago Teresa Teodósio
6690e8b103
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
pirms 8 gadiem
Forrest
d3476bae04
Merge pull request #230 from bersace/json-render
Render config as JSON
pirms 8 gadiem
Étienne BERSAC
adad72741e
Render config as JSON
pirms 8 gadiem
Forrest
7f41dff871
Merge pull request #229 from mchugh19/master
Support engine configuration
pirms 8 gadiem
Christian McHugh
ac4ed62c03
Support engine configuration
pirms 8 gadiem
Forrest
76de5f9285
Merge pull request #227 from bradthurber/master-auth-ldap-support
Add support for master eauth LDAP config
pirms 8 gadiem
Brad Thurber
b9ae603fd7
Add support for master eauth LDAP config
pirms 8 gadiem
Forrest
4388d06963
Merge pull request #225 from bradthurber/non-templated-cloud-config
Ability to create non-templated cloud maps/providers/profiles
pirms 8 gadiem
Brad Thurber
b3a3fa4d72
Ability to create non-templated cloud config files (maps/providers/profiles).
pirms 8 gadiem
Forrest
0a601fc310
Merge pull request #224 from bradthurber/allow-empty-gitfs-keys
allow gitfs.keys state to function without error when no keys
pirms 8 gadiem
Brad Thurber
d2df211011
allow state to function without errors if no keys are find in pilar
pirms 8 gadiem
Forrest
8ed58c6528
Merge pull request #221 from bradthurber/new-gitfs-functionality
add new gitfs functionality
pirms 8 gadiem
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
pirms 8 gadiem
Brad Thurber
939aa37028
Cleanup and make closer to the PR submitted for the mainline salt repo master config file
pirms 8 gadiem
Brad Thurber
c4ef48c5e8
add new gitfs functionality
pirms 8 gadiem
puneet kandhari
6578fb2ae2
Merge pull request #219 from UtahDave/master
Use the latest stable salt from repo.saltstack.com
pirms 8 gadiem
David Boucha
cca75d93d7
Use the latest stable salt from repo.saltstack.com
pirms 8 gadiem
puneet kandhari
d0d4a6cc6b
Merge pull request #218 from UtahDave/master
Comment out second master config example
pirms 8 gadiem
David Boucha
08501c9e18
Comment out second master config example
This second master config example was causing problems when vagrant
would use the default pillar.example
pirms 8 gadiem
Wolodja Wentland
633ce3630f
Merge pull request #216 from centromere/driver-version-check
Added version check for provider/driver backwards compatibility
pirms 8 gadiem
John Galt
e26b805279
Added version check for provider/driver backwards compatibility
pirms 8 gadiem