saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
989 Commits 3 Branches 68 Tags 2 MiB
a932a8cc84
Commit Graph

474 Commits

Author SHA1 Message Date
Furlot
45e686b7f2 Add http proxy support for minion 2017-01-06 17:12:59 +01:00
Brian Jackson
f58562beeb Merge pull request #276 from saltstack-formulas/fix_pygit2_debian 
Fix pygit2-libgit2 builds on Debian like platforms.
 2016-12-25 23:17:47 -08:00
Rene Jochum
e329bda7bf Fix pygit2-libgit2 builds on Debian like platforms. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-12-25 17:41:47 +01:00
Jeff Baskin
0166cd4097 Added fedora. 2016-12-19 23:29:42 -05:00
John Kristensen
43663fec1b Have salt-api service watch the master config files 
The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.
 2016-12-08 12:19:53 +11:00
Dafydd Jones
8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) 2016-12-01 21:30:12 +00:00
Brian Jackson
d68c0b63ee Merge pull request #267 from fizmat/pkgrepo-cleanup 
Pkgrepo cleanup
 2016-11-21 22:53:47 -08:00
Matt Willsher
157f356442 Correct SmartOS config path 2016-11-14 22:22:52 +00:00
Matt Willsher
5b87c50e46 Add SmartOS salt-master and gitfs support 2016-11-14 22:13:52 +00:00
Ivan Kadochnikov
8552113226 update map.jinja after Arch renamed the package 2016-11-10 16:05:48 +03:00
Ivan Kadochnikov
fd0b200fea Delete repotype from map.jinja, unused after 8f2191471 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
e18eeffb5e Delete debian saltstack repo gpg, not used since 87f3e849d2 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
fcefad0899 Delete pkgrepo/ubuntu, not used anymore 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
13ea551011 Simplify pkgrepo logic, made possible by 3b265a544 2016-11-10 11:09:19 +03:00
Forrest
01043740dc Merge pull request #259 from kakwa/separate_engines_config 
make the configuration of engines specific to master or minion
 2016-11-09 12:08:33 -08:00
Niels Abspoel
ff8bf379a7 Merge pull request #261 from fizmat/pkgrepo-redhat 
Add state that ensures pkgrepo for RedHat is absent
 2016-11-09 20:46:34 +01:00
Forrest
f6551c5fc8 Merge pull request #265 from genuss/pillar_opts 
Change default value for pillar_opts
 2016-11-09 10:01:41 -08:00
genuss
8fd8c76d5f Change default value for pillar_opts 2016-11-09 20:48:15 +03:00
Rob Ruma
6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id 2016-10-14 08:25:18 -04:00
Ivan Kadochnikov
423d58dd88 Add state that ensures pkgrepo for RedHat is absent 2016-10-07 16:50:46 +03:00
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
carpenti
3098aebcad add engines as a reserved_keys to not add generic configuration 2016-10-05 22:28:33 +02:00
carpenti
08d10376ab implementing retro-compatible behavior 
Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
 2016-10-05 21:14:00 +02:00
carpenti
c27bfd92b7 make the configuration of engines specific to master or minion 
the engines are now configured using the following pillars:

* salt.master.engines
* salt.minion.engines

instead of a global salt.engines pillar.

Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
 2016-10-05 10:26:36 +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
Thomas Larsen
d1cbec3fe2 Added support for downloading formulas from multiple baseurls into the same environment. 2016-02-08 13:45:09 +00:00
Kevin Schmidt
ce6849247e add consul config support 2016-01-19 16:54:05 +00:00
Forrest
0fee3f58f2 Merge pull request #196 from iamseth/master 
Replace pkgrepo with offical Saltstack repo
 2016-01-17 20:07:50 -08:00
Kevin Schmidt
41f2de74bd * add gitfs whitelist and blacklist 2016-01-13 11:48:27 +00:00
Niels Abspoel
adb0c7008d removing accidentally committed files 2016-01-09 21:45:23 +01:00
Niels Abspoel
cbe5763668 fix pillar and libvirt 2016-01-09 19:39:47 +01:00
Seth Miller
8f2191471b Replace pkgrepo with offical Saltstack repo 
issue #180
 2016-01-08 11:21:22 -06:00
Mohammed Naser
3b8669cd67 dropped ppa and updated to official repos for ubuntu 2015-12-24 13:28:35 -05:00
Krzysztof Pawłowski
02be0b1367 add support for returner setting in minion configuration 2015-12-21 15:00:35 +01:00
James O'Neill
6d9683ca1f Add clean_file to wipe saltstack.list contents 2015-12-09 23:33:00 +13:00
James O'Neill
87f3e849d2 Make Debian use pkgrepo.managed and allow the repo name and key_url to be overridden via Pillar lookup. 2015-12-05 23:24:05 +13:00
risca
3a83533669 fixed ext_pillar according to https://docs.saltstack.com/en/latest/topics/development/external_pillars.html#configuration and master_tops according to https://docs.saltstack.com/en/latest/topics/master_tops/index.html 2015-11-18 19:59:16 +01:00
abednarik
8b39b37762 Replace deprecated iteritems() with items() 2015-11-16 22:05:36 -03:00
Forrest
5c960fd2d8 Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion 
Never fall back to `cfg_salt['master']` in minion config
 2015-11-15 12:19:51 -08:00
Devon Stewart
d730d4f2b8 Using cfg_salt['master'] is never the right answer 
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
  `salt:minion:master`
 2015-11-15 12:11:20 -08:00
Forrest
eeb7235ee0 Merge pull request #184 from 0xf10e/master 
use salt_settings.syndic_service so state works on FreeBSD, too
 2015-11-04 12:26:06 -08:00
Forrest
8d1b382343 Merge pull request #183 from babilen/dev-show-jid 
Manage show_jid option in master configuration
 2015-10-13 12:00:56 -07:00
Wolodja Wentland
0216d66527 Remove trailing whitespace from master config 2015-10-13 16:37:14 +02:00
root
d7382e2d1f use salt_settings.syndic_service so state works on FreeBSD, too 2015-10-13 15:41:41 +02:00
Wolodja Wentland
52893bc978 Manage show_jid in master configuration 
This makes it easier for users to check the status of jobs that ran into
a timeout.
 2015-10-13 14:56:51 +02:00
puneet kandhari
8d098484ed Merge pull request #164 from genuss/sign_pubkey 
Add master_type option
 2015-09-29 09:44:14 -07:00
Matthew X. Economou
827ed47a25 Filter all calls to formulas_git_opt through load_yaml 
Jinja macros are not actually functions.  The only thing they can return
is a string.  In order to return structured data, the callee must
serialize it, and the caller must deserialize it.  This state formula
uses YAML as the intermediary, hence the occurrence of both the
`|yaml` (callee) and `|load_yaml` (caller) filters in its code.

The post-render "mapping values are not allowed here" error in
*salt/formulas.sls* or the broken rendering of
*salt/files/master.d/f_defaults.conf* happens because invocations of the
`formulas_git_opt` macro in several Jinja `set` statements do not get
deserialized, resulting in the trailing newline followed by three dot
characters (`...`), which YAML uses to signal the end of a document.
Correcting these rendering errors requires adding the necessary
deserialization code at those locations (i.e., filtering the macro call
through `|load_yaml`).
 2015-09-03 14:56:45 -04:00
Shane Poage
f0e691fa13 Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID. 2015-09-01 18:33:18 -05:00
Brian Jackson
9779609bc4 Remove mapping test 
This test isn't available in certain popular versions of Jinja (namely the one
installed by default in CentOS 6).
 2015-08-27 17:37:53 -05:00
Shane Poage
addc6d5a26 Added logic to properly install pygit2 on ubuntu systems and made the pygit2 installation more flexible in general. 2015-08-20 02:46:16 -05:00
Nitin Madhok
5db269e560 Merge pull request #166 from irtnog/enable-salt-api-service 
Configure the salt-api service to start at boot time
 2015-08-09 07:58:04 -04:00
Simon Lloyd
02f7b279a1 Only watch salt-api package if install_packages=true 
Also watch salt-api pkg instead of salt-master one.
 2015-08-08 17:58:45 +02:00
jpic
825fd7cd77 Fixed pillar_roots generation for salt-master. 
With a simple pillar like this::

    $ sudo salt-call --config-dir /srv/etc/bootstrap --pillar-root /srv/pillar pillar.get salt:pillar_roots
    local:
        ----------
        base:
            - /srv/pillar

This was generated in /etc/salt/master.d/f_defaults.conf::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:base:- /srv/pillar
    #

Resulting in parse errors by salt::

    $ sudo salt '*' state.highstate
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^

This patch will fix it as such::

          ID: salt-master
    Function: file.recurse
        Name: /etc/salt/master.d
      Result: True
     Comment: Recursively updated /etc/salt/master.d
     Started: 11:37:12.946823
    Duration: 6255.296 ms
     Changes:
              ----------
              /etc/salt/master.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -528,7 +528,9 @@
                       # Pillar is laid out in the same fashion as the file server, with environments,
                       # a top file and sls files. However, pillar data does not need to be in the
                       # highstate format, and is generally just key/value pairs.
                      -pillar_roots:base:- /srv/pillar
                      +pillar_roots:
                      +  base:
                      +    - /srv/pillar
                       #

Resulting in::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:
      base:
        - /srv/pillar
    #
 2015-08-06 11:37:55 +02:00
Matthew X. Economou
c014015e79 Configure the salt-api service to start at boot time 2015-08-02 21:17:36 -04:00
genus
4ff1a746d6 Add master_type option 2015-07-29 19:48:56 +03:00
puneet kandhari
2af4bf3bb5 Merge pull request #161 from genuss/sign_pubkey 
Add options for mult-master setup
 2015-07-27 06:58:48 -05:00
Matthew X. Economou
ba9cc2605c Use the py27-pygit2 package when installing pygit2 on FreeBSD 2015-07-24 17:06:15 -04:00
Matthew X. Economou
ea5a9f1f2c Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package 2015-07-24 16:53:24 -04:00
Matthew X. Economou
ef275bd138 Allow customizing the GitPython package name. 2015-07-24 16:31:00 -04:00
Matthew X. Economou
b477990830 Use the py27-GitPython package when installing GitPython on FreeBSD. 2015-07-24 16:30:02 -04:00
Matthew X. Economou
85a426ccdf Add new salt:python_git key. 
This key defaults to a value of `python-git`.
 2015-07-24 16:27:52 -04:00
Matthew X. Economou
5b93601c78 Use the py27-salt package when installing salt-ssh on FreeBSD 
On FreeBSD salt-ssh gets bundled into a single package with the other
SaltStack components (minion, master, etc.).
 2015-07-24 16:11:23 -04:00
genus
a738198d8b Add verify_master_pubkey_sign 2015-07-24 17:58:41 +03:00
genus
fffd30fe17 Add master_sign_pubkey option 2015-07-24 17:41:49 +03:00
Brian Jackson
4c1f57792a Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip." 
This reverts commit 7bb82b0178.
 2015-07-20 17:05:57 -05:00
Brian Jackson
6e98d508c4 Revert "Fix salt/api.sls." 
This reverts commit 8a1b8dc9db.
 2015-07-20 17:05:57 -05:00
Brian Jackson
d216a3f651 Revert "Install cherrypy/tornado from pip only if use_pip is True." 
This reverts commit 90282eff03.
 2015-07-20 17:05:56 -05:00
Brian Jackson
8448aa4021 Revert "Fix stuff suggested by @iggy." 
This reverts commit c5ae289fa1.
 2015-07-20 17:05:56 -05:00
Brian Jackson
ed3ab22a13 Revert "Add support for GitPython and salt-ssh on FreeBSD masters" 
This reverts commit b03831c0b0.
 2015-07-20 17:05:56 -05:00
Brian Jackson
f9cb912a65 Revert "salt.api state fails" 
This reverts commit 22b8dde1ff.
 2015-07-20 17:05:56 -05:00
Brian Jackson
ef73e4ce98 Revert "Change variable lookup to match usage in other states" 
This reverts commit 14b466e022.
 2015-07-20 17:05:54 -05:00
puneet kandhari
b04fc8c843 Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython 
Add support for GitPython and salt-ssh on FreeBSD masters
 2015-07-14 06:43:03 -07:00
Matthew X. Economou
14b466e022 Change variable lookup to match usage in other states 
Done at the maintainer's request.
 2015-07-14 09:40:16 -04:00
Marco Orovecchia
22b8dde1ff salt.api state fails 
Seems there are several colons missing for salt.api to work correctly, hope I found all of them
 2015-07-14 14:21:14 +02:00
Matthew X. Economou
b03831c0b0 Add support for GitPython and salt-ssh on FreeBSD masters 
This change tweaks the GitPython package installation state to support
alternate package names (on FreeBSD, it's called "py27-GitPython").
Also, on FreeBSD salt-ssh is included in the "py27-salt" package by
default, requiring an update to `distro_map`.
 2015-07-14 03:22:28 -04:00
René Jochum
c5ae289fa1 Fix stuff suggested by @iggy. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:31:32 +02:00
René Jochum
90282eff03 Install cherrypy/tornado from pip only if use_pip is True. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:08:20 +02:00
René Jochum
8a1b8dc9db Fix salt/api.sls. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:46:17 +02:00
René Jochum
7bb82b0178 Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:37:10 +02:00
Brian Jackson
779e6c9c63 Merge pull request #122 from matthew-parlette/master 
Updated master.d/f_defaults for 2014.7
 2015-07-07 12:43:01 -05:00
Devin Christensen
645b4c65ce Fix syntax error 2015-06-19 15:33:16 -06:00
puneet kandhari
8fcb42819b Merge pull request #146 from quixoten/fix_syndic 
Fix syndic requisites
 2015-06-17 11:28:28 -05:00
Devin Christensen
8479111cbd Fix syndic requisites 
The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.
 2015-06-17 09:53:31 -06:00
Petr Demin
eb421c676f formulas.jinja: python 2.6 support 2015-06-17 17:51:40 +03:00
Petr Demin
d4180295e3 formulas.jinja: python 2.6 support 2015-06-17 17:12:28 +03:00
Niels Abspoel
6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
Matt Willsher
1cf72d85f8 The git command line tool is a requirement of pygit2 2015-06-05 21:27:01 +01:00
Matt Willsher
e2d192ba89 Improvements to Enterprise Linux family OSs. 
* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository

Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
 2015-06-04 17:35:40 +01:00
puneet kandhari
145b58a9d3 Remove Duplicates from defaults.yaml and map.jinja 2015-05-26 13:28:17 -05:00
Niels Abspoel
14c262fdad fix empty formulas list in pillar with empty dic. 2015-05-17 15:39:49 +02:00
Edvinas Klovas
8992e15882 fix typo 2015-05-16 15:51:19 +03:00
Edvinas Klovas
47b37f2ffb Fix pillar_roots configuration format in master 
This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:

```yaml
pillar_roots:
  base:
     /srv/salt/dir1
  dev:
     /srv/salt/dir2
     /srv/salt/dir3
  locale:
     /srv/salt/dir4
```

Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:

```yaml
pillar_roots:

  base:

     /srv/salt/dir1

  dev:

     /srv/salt/dir2

     /srv/salt/dir3

  local:

     /srv/salt/dir4

```

The minion configuration is not affected and renders fine.
 2015-05-16 15:15:56 +03:00
Javier Domingo
4344a1311b Cleanup template for easier user reading 
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
 2015-05-08 22:33:43 +02:00
Andrew Vant
a01249a7fc ec2/gce profiles/providers are no longer configured if they are not used. 
Needed because salt-cloud will attempt to load them even if they are
filled with invalid default values, creating error spam.
 2015-04-17 10:48:47 -04:00
Matt Parlette
efcefd6579 Updated master.d/f_defaults for 2014.7 
Added config setting for:

* pillar_source_merging_strategy
 2015-04-15 15:36:09 -04:00
Brian Jackson
15e63e8fd0 Merge pull request #117 from andrew-vant/cloud-templates-redirect 
Added pillar option to redirect profile and map folders.
 2015-04-14 11:34:12 -05:00
Andrew Vant
e632b8bcb5 Cloud file.recurse loop no longer hardcodes folder list. 2015-04-13 16:08:11 -04:00
Forrest Alvarez
d3adb685b6 Change spaces to dashes in IDs for ssh.sls 2015-04-10 16:11:19 -07:00
Simon Lloyd
462455ead9 Exclude require statement when install_packages is False. 
The 'require' statement needs a list as input, but doesn't get
any input when install_packages is set to False.
 2015-04-09 17:16:15 +02:00
Andrew Vant
f0e9c2df87 Enforced root-only permissions on cloud.providers.d. 
As mentioned in issue #118, provider files may contain passwords
or API keys and should be restricted. Profiles/maps are probably
OK with the defaults.
 2015-04-06 11:24:41 -04:00
Andrew Vant
f3ed6e1828 cloud.providers.d can now be redirected. 
This obsoletes the salt☁️folders and salt☁️providers pillar
entries. Provider keys have been moved to /etc/salt/pki/cloud.
 2015-04-03 19:30:26 -04:00
Andrew Vant
7e074dc379 Supplied default values for all pillar queries in provider templates. 
These aren't intended to function; they're here to allow the use of
file.recurse on the provider folder, without requiring the user
to provide pillar data for templates they're not using.
 2015-04-03 18:47:08 -04:00
Andrew Vant
fb1d7e8d3b Added pillar option to redirect profile and map folders. 2015-04-03 17:33:25 -04:00
Andrew Vant
11efee54c3 Added mine_functions to f_defaults.conf. 2015-04-03 14:34:34 -04:00
Nitin Madhok
a11c39cf32 Merge pull request #111 from iggy/master 
Switch config file.recurse to clean by default and tell it to ignore _*
 2015-04-01 05:08:01 -04:00
Matthew X. Economou
943d7f2dc1 Reverts lookup of salt_cloud_certs to original pillar key, in line with existing documentation and the certificate template file. 
Please refer to issue https://github.com/saltstack-formulas/salt-formula/issues/113.
 2015-03-30 13:54:50 -04:00
Niels Abspoel
9ae8a4d746 Fix recursion in api.service 2015-03-28 22:29:01 +01:00
Brian Jackson
7649c26a0d Switch config file.recurse to clean by default and tell it to ignore _* 
Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
 2015-03-27 17:58:05 -05:00
Brian Jackson
4533cc7d0e Add modules to install gitfs backend dependencies 
Add modules for gitfs dependencies and documentation for how to use them.
 2015-03-25 21:52:29 -05:00
Brian Jackson
924c04c0d8 Add setting to not install packages 
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
 2015-03-24 12:08:08 -05:00
Brian Jackson
8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d 
New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
 2015-03-24 10:46:25 -05:00
Brian Jackson
cb3aa80c62 Don't overwrite salt variable 
Using a variable named salt is a bad idea when salt already has a variable
named salt.
 2015-03-16 23:39:32 -05:00
Niels Abspoel
5785091305 Added salt-api support 2015-03-08 00:01:28 +01:00
Niels Abspoel
5d09355c84 fix suse os_family 2015-03-07 11:24:50 +01:00
Niels Abspoel
90f23948ef create config option for mine_interval 2015-02-20 20:43:14 +01:00
Niels Abspoel
b8e53771f3 add mine_get function to master config 2015-02-19 21:59:44 +01:00
Will Saxon
ae8e4ca492 don't try to load pkgrepo on non-Debian distros 
fixes #83 by wrapping contents of pkgrepo/init.sls in an {% if %}.

Change-Id: I8260fdf5cf802c0b28197516da374add6c3002a2
 2015-02-07 19:26:59 -05:00
Niels Abspoel
23fd8b64af Fix #39 multi master support to minion 
This will fix #39

And it will be backwards compatible with the current pillar configuration.
 2015-02-06 22:27:55 +01:00
Niels Abspoel
7ddc1692ec added rest_tornado to _defaults.conf 
see pillar.example for configuration
 2015-02-06 18:46:32 +01:00
Nitin Madhok
f39fff2329 Merge pull request #90 from aboe76/master 
Updated map.jinja for archlinux package convention
 2015-02-06 02:16:17 +05:30
Jimmy Tang
2e30a44e41 saltify provider should set correct master 
This is necessary for the correct settings on the minions when saltifying new hosts
 2015-01-26 17:41:19 +00:00
Nitin Madhok
fa6c39eccd Revert "Add mine_functions to master config template" 2015-01-16 02:20:43 +05:30
Jimmy Tang
deee69319f Add mine_functions to master config template 2015-01-15 16:15:38 +00:00
Niels Abspoel
7b4104cf6e updated archlinux map.jinja, to install salt-zmq 
updated the map style without the base='default' parameter
 2015-01-13 20:07:46 +01:00
Niels Abspoel
ea4623b0a3 fix salt-ssh on Arch and Opensuse 2015-01-11 20:35:29 +01:00
Simon Lloyd
cb03e885d4 Fix: pkgs is undefined 
Update sls files to match name change in map.jinja.
 2015-01-11 19:31:05 +01:00
Niels Abspoel
acf5832f68 fix #84 with same logic as dnsmasq-formula 2015-01-11 12:21:42 +01:00
Niels Abspoel
4dc0044772 update use_lookup_map with merges from upstream 2015-01-07 21:06:02 +01:00
Niels Abspoel
daf04c2688 Merge branch 'master' into use_lookup_map.jinja 2015-01-07 21:03:52 +01:00
Tim O'Guin
b19c3acc77 merged with upstream 2015-01-06 13:10:59 -06:00
Niels Abspoel
896578a75a Removed package_map lookup 
Added map.jinja solution more in line with other formulas,
This also improves issue #30

and pull request #30
 2014-12-31 11:52:31 +01:00
Niels Abspoel
5bed5368e2 updated minion _defaults.conf to version 2014.7 2014-12-27 00:00:48 +01:00
Forrest
77c0ecd729 Merge pull request #78 from qbcode/master 
Add saltify provider, map and profile templates
 2014-12-24 12:45:01 -08:00
Raphaël Hertzog
7fb86b9076 Fix the handling of event_return_whitelist/event_return_blacklist 
If those options are set in pillar data, the jinja template
salt/files/master.d/_defaults.conf would fail to compile trying to
evaluate non-existing variables.

Replace those variables with the corresponding dictionnary entries.
 2014-12-24 16:25:51 +01:00
Raphaël Hertzog
d4ae38f825 Import the salt/formulas.jinja template with context 
This is only needed for salt versions older than 2014.7 that do not
define the global "salt" variable in such context.
 2014-12-24 16:19:43 +01:00
Raphaël Hertzog
445108f87a Avoid “set salt” jinja calls that mask the usual salt variable 
Most include do not expect salt to be something else than the usual salt
variable giving access to all the salt modules. Instead we use cfg_salt.
And for consistency we rename the master/minion variables to
cfg_master/cfg_minion too.
 2014-12-24 16:12:40 +01:00
Jimmy Tang
b687659bff Initial add of dummy saltify settings 
This commit also provides a more concrete example of a 'host' to
be saltified.  Users can do

    salt-cloud -p make_salty someinstance

or

    salt-cloud -m /etc/salt/cloud.maps.d/foo.conf

Either which way the online docs should really be updated with more
concrete examples.
 2014-12-24 08:40:10 +00:00
Wolodja Wentland
98917adad2 Merge pull request #77 from rhertzog/misc-bugfixes 
FIxes for nodegroups/log_granular_levels settings and small cleanups
 2014-12-24 08:52:29 +01:00
Raphaël Hertzog
8a828b506e Use items() method instead of iteritems() for Python 3 compatibility 
In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.
 2014-12-23 17:42:43 +01:00
Raphaël Hertzog
2f2cd972ac Use items() method to loop over nodegroups/log_granular_levels dictionaries 
Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
 2014-12-23 17:35:26 +01:00
Raphaël Hertzog
f46b4f29d8 Add new “salt.formulas” state to manage salt formulas 
This state downloads formulas from git repositories and ensures
that they are recorded in the file_roots setting.
 2014-12-23 17:24:19 +01:00
Seth House
02f8debea8 Merge pull request #72 from aboe76/update_config_2014.7 
Updated master config file to 2014.7
 2014-12-22 16:08:32 -07:00
Raphaël Hertzog
339adddfcc Add new “salt.pkgrepo” state 
This state enables the official saltstack package repository in order to
always benefit from the latest version. This state currently only works on
Debian and Ubuntu, and aims to implement the installation recommendations
of the official documentation:
http://docs.saltstack.com/en/latest/topics/installation/index.html
 2014-12-22 17:09:51 +01:00
Raphaël Hertzog
b93ec22244 Add a “salt.standalone” state 2014-12-21 15:41:16 +01:00
Niels Abspoel
5029504212 Updated master config file to 2014.7 
Fixed explanations, and improved logic code to client_acl
 2014-12-19 23:18:08 +01:00
Niels Abspoel
af7f9d722a more improvements in _defaults.conf 
better newlines with iterations.
 2014-12-14 20:38:47 +01:00
Niels Abspoel
4b0ec5dc01 Improved jinja spacing in template 
This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks
 2014-12-11 22:09:21 +01:00
Niels Abspoel
7da141721b fix spacing with gitfs. 
Updated gitfs jinja, to mirror master file
 2014-12-09 23:22:06 +01:00
Niels Abspoel
ef4bc1a25a Added support for salt minion gitfs 
Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate
 2014-12-08 22:17:07 +01:00
Niels Abspoel
a54d52a5bc fix opensuse packaging 2014-12-08 21:13:29 +01:00
Niels Abspoel
27bf5324ee added openSUSE support 2014-12-05 23:33:47 +01:00
Tim O'Guin
be972d9057 updated salt-master config template to add presence_events setting 2014-11-25 10:18:20 -06:00
Nitin Madhok
00a9e0640c Removing unnecessary - 
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
 2014-11-14 01:19:37 -05:00
Tiru Srikantha
70b5c981fa Test if individual gitfs remote is string 
https://github.com/saltstack-formulas/salt-formula/issues/64

Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example.
 2014-11-12 20:32:43 -08:00
Nitin Madhok
570b45a9ef Removing crypto pip dependency for complete RedHat family 2014-11-12 20:56:15 -05:00
Nitin Madhok
0f5f976433 Merge pull request #63 from sinnerschrader/feature/add_yaml_utf8_to_master_config 
adds `yaml_utf8` option to master config
 2014-11-09 10:12:37 -05:00
Marvin Frick
868854c2e7 enables use of jinja < 2.6 
Commit 2b51a6f0c3 introduced options for gitfs_remotes in a pillar by using a jinja test to see if a parameter is a mapping (dict etc.). This feature however is only available in jinja 2.6 or newer (see http://jinja.pocoo.org/docs/dev/templates/#mapping).
Although this version of Jinja is available on Ubuntu, other OS / package managers do provide older versions (2.2.1 in RedHat 6).

This change makes use of the "iterable" test which should do the exact same thing.
 2014-11-09 13:16:06 +01:00
Marvin Frick
8a187ac13f adds yaml_utf8 option to master config 
Reference about this config value: http://docs.saltstack.com/en/latest/ref/configuration/master.html#yaml-utf8
Reference why this might be useful: https://github.com/saltstack/salt/issues/3436#issuecomment-61225863
 2014-11-09 13:02:14 +01:00
Nitin Madhok
a8227385cc Typo fix 
Fixing typo
 2014-11-06 14:23:52 -05:00
Nitin Madhok
c6c8958aac Removing crypto pip dependency for complete Debian family 
Removing crypto pip dependency for the ``os_family`` ``Debian``.

Refer to PR:
https://github.com/saltstack-formulas/salt-formula/pull/60#issuecomment-62029457
 2014-11-06 14:11:19 -05:00
Nitin Madhok
f84a0c4a9f Removing crypto pip dependency for Ubuntu and Debian 
Fixes:
https://github.com/saltstack-formulas/salt-formula/issues/59

Refer to PR:
https://github.com/saltstack-formulas/salt-formula/pull/60
 2014-11-06 13:33:53 -05:00
Nitin Madhok
bb09803f90 Revert "Removed crypto dependency from salt.cloud." 2014-11-05 14:59:26 -05:00
Andrew Vant
5a6302e021 Removed crypto dependency from salt.cloud. 
It doesn't seem to be available from pip anymore, and may not be
a real dependency. Salt-cloud certainly seems to work fine without
it.
 2014-11-04 16:44:28 -05:00
Tim O'Guin
cfa1f4eafc fix syntax issues in package-map.jinja 2014-10-28 11:50:23 -05:00
Tim O'Guin
a3c54f0e8f added salt-ssh to package-map.jinja for most OS families 2014-10-28 11:46:38 -05:00
Tim O'Guin
cde16097ed add support for installing salt-ssh and managing the roster file, updated README and pillar.example 2014-10-28 11:45:32 -05:00
Tim O'Guin
9fa42fe09d fixed YAML issue with templated reactor config 2014-10-28 10:55:18 -05:00
Tim O'Guin
3d52dfd8ec added proper indentation for jinja conditionals in reactor template 2014-10-24 17:04:12 -05:00
Tim O'Guin
2852e7b897 add templated file for reactor configuration and update pillar.example. 2014-10-24 14:48:56 -05:00
Ajna Cackovic
2b51a6f0c3 Allow repo options to be set per repo for gitfs_remotes in pillar 2014-10-23 18:32:47 -07:00
Seth House
1682df8592 Merge remote-tracking branch 'origin/pr/47' 
Conflicts:
	salt/master.sls
	salt/minion.sls
 2014-10-09 16:39:07 -06:00
Andrew Vant
00e245e20a Added recursive management of minion.d and master.d. 
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
 2014-10-06 11:56:07 -04:00
Andrew Vant
970da0ef37 Added salt-cloud support for Rackspace OpenStack servers. 2014-10-03 21:23:50 -04:00
Johannes
791025e065 Avoid config key clashes 
Fixes #48
 2014-10-03 09:43:59 +01:00
Kevin Bowling
4675d68bd8 Initial FreeBSD support 2014-10-02 00:20:29 -07:00
Kevin Bowling
b6d78a415d Add FreeBSD to the package-map 2014-10-01 23:54:30 -07:00
Johannes
247e6403a7 Add missing .conf to config files 
Closes #45
 2014-10-01 18:37:09 +01:00
Love Nyberg
75a1f888eb #12 Moved master and minion config file to .d 2014-09-08 21:38:30 +02:00
Daniel Rodriguez
3bdf2789a1 Added rest_cherrypy section 2014-08-22 22:57:21 -05:00
Seth House
6c0cc53d5c Merge pull request #42 from westurner/fix-nested-_roots 
Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37)
 2014-07-23 11:45:29 -06:00
Love Nyberg
6405354299 Fixed merge conflict and rearaged readme. 2014-07-22 10:24:09 +02:00
Wes Turner
bc7ccedf45 Fix nested file,pillar _roots in minion and master templates 
See #37 "Fixed file_roots config generation with several environment"
 2014-07-22 03:04:26 -05:00
Love Nyberg
e798b46c8a Added functionality to state for salt syndic deamon. 2014-07-20 17:05:53 +02:00
Love Nyberg
85ce73a839 Added functionality to state for salt cloud and exampel for EC2 and GCE 2014-07-20 16:59:38 +02:00
Shaun Carlson
9b730fc0c8 Fixed typo in autoreject_file setting 
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
 2014-06-05 14:16:57 -06:00
Oleg Tsarev
94da2654e2 Fixed file_roots config generation with several environment 2014-05-10 15:21:37 +02:00
Chris McNabb
028412ee5e use master when if in master 2014-03-28 15:13:33 -04:00
Chris McNabb
d0392b576e add Amazon os 2014-03-19 14:06:27 -04:00
Oleg Tsarev
18d7471198 Supported Arch Linux 2014-02-11 07:17:48 +04:00
Oleg Tsarev
e3b2ebeb06 Actualized master and minion config files templates 2014-02-11 07:04:03 +04:00
tiger-seo
507f2abc1a possibility to define Halite configuration for salt-master 2014-01-14 12:30:43 +02:00
tiger-seo
f4b839a4fb sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion 2014-01-08 15:29:39 +02:00
Kenneth Wilke
9404ebf915 Added module_config section to minion template 2013-09-03 09:45:24 -05:00
Kenneth Wilke
d337cc2784 Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula 2013-08-27 11:14:18 -05:00
Kenneth Wilke
e3a29bf69a ext_pillar fix 2013-08-27 10:33:06 -05:00
Kenneth Wilke
1f71bef33b jijna syntax fix 2013-08-27 10:30:23 -05:00
Kenneth Wilke
e104b3eb41 fixed ext_pillar 2013-08-27 10:28:33 -05:00
Kenneth Wilke
426493b76d fixed ext_pillar 2013-08-27 10:20:42 -05:00
Justin Phelps
6282d9570c Corrected the typo for the minion configuration file. 2013-08-23 16:03:26 -05:00
Kenneth Wilke
c080cf37d6 ext_pillar fix 2013-08-23 12:01:36 -05:00
Kenneth Wilke
e83d25b80f newline fix 2013-08-23 11:57:45 -05:00
Kenneth Wilke
98fd674c95 indentation fix 2013-08-23 11:55:09 -05:00