Commit Graph

125 Commits

Author SHA1 Message Date
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