Commit Graph

11 Commits

Author SHA1 Message Date
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
Matthew X. Economou 001b034eb5 Replace absolute config pathname prefixes with the config_path variable 2016-03-29 13:28:47 -04:00
Niels Abspoel 6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02: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 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
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 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
Raphaël Hertzog b93ec22244 Add a “salt.standalone” state 2014-12-21 15:41:16 +01:00