2
0
Commit Graph

251 Commits

Author SHA1 Message Date
Marcin Witowski
9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template 2016-10-07 00:48:59 +02:00
Niels Abspoel
64e7376fe4 fix minion daemon to be enabled if master_type is set to disable 2016-10-01 11:31:56 +02:00
Niels Abspoel
1ffbb4b6bc add option to start minion service if master_type is set to disable 2016-10-01 09:47:29 +02:00
Niels Abspoel
13a6ecf8b9 add missing files 2016-09-30 22:00:11 +02:00
Javier Bértoli
4e8d36f308 Merge pull request #253 from jerrykan/cloud_without_pip
By default don't install cloud dependencies using pip
2016-09-21 06:35:17 -03:00
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.
2016-09-21 17:01:37 +10:00
Forrest
ad440d904c Merge pull request #250 from luitzifa/master
Fixes saltstack-formulas/salt-formula#190
2016-09-13 09:33:59 -07:00
Daniel Krämer
749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial 2016-09-13 09:03:06 +02:00
Daniel Krämer
a842dbe621 Fixes saltstack-formulas/salt-formula#190 2016-09-05 10:48:31 +02:00
Jeremy T. Bouse
79fcda8806 Clean up formating of nodegroups 2016-09-04 15:00:03 +00:00
Jeremy T. Bouse
a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf 2016-09-04 14:47:39 +00:00
Krzysztof Pawłowski
776c5ecbe6 Add yaml_utf8 option to salt master configuration. 2016-08-24 13:06:24 +02:00
Matthew Richardson
89ece150e6 Tidy up comments, add some docs/examples. 2016-08-23 09:48:39 +01:00
Matthew Richardson
5abdaee5a2 Handle config opts not part of default config. 2016-08-22 11:22:08 +01:00
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
2016-08-13 15:29:03 -04:00
Rene Jochum
f17b8f5424 Add optional method to remove /etc/salt/master.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:13:21 +02:00
Rene Jochum
1b611c871e Add optional method to remove /etc/salt/minion.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:11:55 +02:00
Rene Jochum
fa6818af35 Use https for the Ubuntu repo same as salt-bootstrap.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-14 18:20:04 +02:00
Matthew X. Economou
12390494cf Add support for s3fs 2016-07-09 08:29:33 -04:00
Rene Jochum
6ae81a9640 Add support for mongodb connection settings to config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 18:44:51 +02:00
Rene Jochum
478fef683b Remove trailing whitespaces in config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 16:22:16 +02:00
Matthew Pherigo
621e1f218c Add support for OpenBSD in map.jinja 2016-07-01 21:25:06 -05:00
Forrest
5f03ce9db1 Merge pull request #234 from rhertzog/pkgrepo-update
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
2016-06-30 09:21:18 -07:00
Forrest
137868bcc1 Merge pull request #237 from msonawane/master
add module_config for minions
2016-06-26 18:40:47 -07:00
Manoj Sonawane
98d591eab2 add module_config for minions 2016-06-27 01:34:05 +00:00
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.
2016-06-20 22:36:54 +02:00
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.
2016-06-20 22:24:20 +02:00
risca
ca42d40ef9 added support for LXC profiles 2016-06-07 19:46:08 +02:00
Forrest
3bc5aa3bce Merge pull request #231 from rocket-labs-sysadmins/master
GitPython package name is fixed for RedHat-based OS
2016-05-30 11:32:02 -07:00
Tiago Teresa Teodósio
6690e8b103 Fixing GitPython package name for RedHat OS family. Tested on CentOS 7. 2016-05-30 13:50:16 +02:00
Étienne BERSAC
adad72741e Render config as JSON 2016-05-29 20:43:45 +02:00
Christian McHugh
ac4ed62c03 Support engine configuration 2016-05-27 23:27:55 -05:00
Brad Thurber
b9ae603fd7 Add support for master eauth LDAP config 2016-05-26 10:52:10 -04:00
Brad Thurber
b3a3fa4d72 Ability to create non-templated cloud config files (maps/providers/profiles). 2016-05-06 14:45:41 -04:00
Brad Thurber
d2df211011 allow state to function without errors if no keys are find in pilar 2016-05-02 09:13:38 -04:00
Brad Thurber
39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) 2016-04-28 09:43:13 -04:00
Brad Thurber
939aa37028 Cleanup and make closer to the PR submitted for the mainline salt repo master config file 2016-04-20 15:10:55 -04:00
Brad Thurber
c4ef48c5e8 add new gitfs functionality 2016-04-19 12:51:17 -04:00
John Galt
e26b805279 Added version check for provider/driver backwards compatibility 2016-03-31 23:17:35 -07:00
John Galt
c4208bb661 Renamed "provider" to "driver" 2016-03-31 19:39:55 -07:00
Matthew X. Economou
abe9b91e66 Replace reference to slspath with the complete URL of the source file
Without this change, importing map.jinja in config files (as opposed to
SLS files) causes a rendering error because `slspath` isn't defined.
The `salt_settings.key_url` variable gets used only in
`salt/pkgrepo/debian/init.sls`.
2016-03-29 13:36:46 -04:00
Matthew X. Economou
001b034eb5 Replace absolute config pathname prefixes with the config_path variable 2016-03-29 13:28:47 -04:00
a.genus
e97822a0d5 Take mine_functions back 2016-03-25 16:58:06 +03:00
Seth Miller
c7552b6d0a Add Windows support to map.jinja
This adds some minimal support for Windows minions.
2016-03-22 20:15:44 -05:00
Imran Iqbal
7f36259614 Remove excessive blank lines rendered after "Miscellaneous settings" 2016-03-04 11:50:36 +00:00
Imran Iqbal
c4e116ee8f Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions 2016-03-04 11:50:33 +00:00
Imran Iqbal
7474d4239d Fix Windows repo settings using values from 2015.8 documentation 2016-03-04 11:50:26 +00:00
Niels Abspoel
a4c5b4f322 update 2015.8.7 version config for the minion 2016-02-20 23:25:06 +01:00
Niels Abspoel
bfcaca38a6 merge options from 2015.8.7 version in f_defaults.conf 2016-02-20 21:07:17 +01:00
Matthew X. Economou
e8021220b8 Revert PR #200
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
2016-02-16 10:20:42 -05:00