0
0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-11 10:14:33 +01:00
Commit Graph

9 Commits

Author SHA1 Message Date
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
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
puneet kandhari
145b58a9d3 Remove Duplicates from defaults.yaml and map.jinja 2015-05-26 13:28:17 -05: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
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