Javier Bértoli
4e8d36f308
Merge pull request #253 from jerrykan/cloud_without_pip
By default don't install cloud dependencies using pip
8 vuotta sitten
John Kristensen
37f82242e7
By default don't install cloud dependencies using pip
The salt-cloud packages automatically pull in the pycrypto and libcloud
dependencies for RedHat and Debian (at least when using the SaltStack
repos), so it doesn't really make sense to install these dependencies
using pip. By default we no longer use pip, but the old behaviour can be
restored by setting 'salt:use_pip' to True in the pillar.
There could probably be a case made for removing the pip stuff
altogether, but we will leave it in for the time being to preserve some
backwards compatibility.
8 vuotta sitten
Forrest
ad440d904c
Merge pull request #250 from luitzifa/master
Fixes saltstack-formulas/salt-formula#190
8 vuotta sitten
Daniel Krämer
749bf0e863
[BIGFUX] make pygit2 work with ubuntu xenial
8 vuotta sitten
Forrest
52bc1badca
Merge pull request #251 from UGNS/master
Clean-up master.d/f_defaults.conf and add winrepo_provider
8 vuotta sitten
Jeremy T. Bouse
4283cba123
Add example for winrepo_provider
8 vuotta sitten
Daniel Krämer
a842dbe621
Fixes saltstack-formulas/salt-formula#190
8 vuotta sitten
Jeremy T. Bouse
79fcda8806
Clean up formating of nodegroups
8 vuotta sitten
Jeremy T. Bouse
a89d8d9b6b
Add winrepo_provider to master.d/f_defaults.conf
8 vuotta sitten
Forrest
2a80f55a17
Merge pull request #249 from msciciel/salt-master-yaml-utf8
Add yaml_utf8 option to salt master configuration.
8 vuotta sitten
Krzysztof Pawłowski
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
8 vuotta sitten
Forrest
5dd3eac097
Merge pull request #247 from mrichar1/other_opts
Handle config opts not part of default config.
8 vuotta sitten
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
8 vuotta sitten
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
8 vuotta sitten
Niels Abspoel
39a329b693
Merge pull request #245 from UGNS/raspbian
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
8 vuotta sitten
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
8 vuotta sitten
Forrest
8050f6cf95
Merge pull request #243 from pcdummy/master
https for the ubuntu repo and option to remove /etc/salt/minion.
8 vuotta sitten
Rene Jochum
f17b8f5424
Add optional method to remove /etc/salt/master.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 vuotta sitten
Rene Jochum
1b611c871e
Add optional method to remove /etc/salt/minion.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 vuotta sitten
Rene Jochum
fa6818af35
Use https for the Ubuntu repo same as salt-bootstrap.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 vuotta sitten
Brian Jackson
15d39babb6
Merge pull request #242 from irtnog/add-s3fs-support
Add support for s3fs
8 vuotta sitten
Matthew X. Economou
d7be9aba9f
Document sample s3fs configuration
8 vuotta sitten
Matthew X. Economou
12390494cf
Add support for s3fs
8 vuotta sitten
Forrest
55864f7cdf
Merge pull request #241 from pcdummy/mongodb
add support for mongodb settings
8 vuotta sitten
Rene Jochum
6ae81a9640
Add support for mongodb connection settings to config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 vuotta sitten
Rene Jochum
478fef683b
Remove trailing whitespaces in config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 vuotta sitten
Forrest
e1b664f4d3
Merge pull request #240 from mwpher/master
Add support for OpenBSD in map.jinja
8 vuotta sitten
Matthew Pherigo
621e1f218c
Add support for OpenBSD in map.jinja
8 vuotta sitten
Forrest
5f03ce9db1
Merge pull request #234 from rhertzog/pkgrepo-update
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
8 vuotta sitten
Forrest
137868bcc1
Merge pull request #237 from msonawane/master
add module_config for minions
8 vuotta sitten
Manoj Sonawane
98d591eab2
add module_config for minions
8 vuotta sitten
Forrest
6b96bda5cd
Merge pull request #235 from rhertzog/master-config-fix
JSON encode values embedded in the salt-master's configuration file
8 vuotta sitten
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 .
8 vuotta sitten
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 .
8 vuotta sitten
Forrest
a96f7093fb
Merge pull request #226 from Sjd-Risca/lxcprofile
Lxcprofile
8 vuotta sitten
risca
ca42d40ef9
added support for LXC profiles
8 vuotta sitten
Forrest
3bc5aa3bce
Merge pull request #231 from rocket-labs-sysadmins/master
GitPython package name is fixed for RedHat-based OS
8 vuotta sitten
kabakaev
f16e012687
Merge pull request #1 from TiagoTT/patch-1
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
8 vuotta sitten
Tiago Teresa Teodósio
6690e8b103
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
8 vuotta sitten
Forrest
d3476bae04
Merge pull request #230 from bersace/json-render
Render config as JSON
8 vuotta sitten
Étienne BERSAC
adad72741e
Render config as JSON
8 vuotta sitten
Forrest
7f41dff871
Merge pull request #229 from mchugh19/master
Support engine configuration
8 vuotta sitten
Christian McHugh
ac4ed62c03
Support engine configuration
8 vuotta sitten
Forrest
76de5f9285
Merge pull request #227 from bradthurber/master-auth-ldap-support
Add support for master eauth LDAP config
8 vuotta sitten
Brad Thurber
b9ae603fd7
Add support for master eauth LDAP config
8 vuotta sitten
Forrest
4388d06963
Merge pull request #225 from bradthurber/non-templated-cloud-config
Ability to create non-templated cloud maps/providers/profiles
8 vuotta sitten
Brad Thurber
b3a3fa4d72
Ability to create non-templated cloud config files (maps/providers/profiles).
8 vuotta sitten
Forrest
0a601fc310
Merge pull request #224 from bradthurber/allow-empty-gitfs-keys
allow gitfs.keys state to function without error when no keys
8 vuotta sitten
Brad Thurber
d2df211011
allow state to function without errors if no keys are find in pilar
8 vuotta sitten
Forrest
8ed58c6528
Merge pull request #221 from bradthurber/new-gitfs-functionality
add new gitfs functionality
8 vuotta sitten