2
0
Commit Graph

410 Commits

Author SHA1 Message Date
Will Saxon
ae8e4ca492 don't try to load pkgrepo on non-Debian distros
fixes  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 multi master support to minion
This will fix 

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 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 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 

and pull request 
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 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 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 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 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 
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 
2014-10-01 18:37:09 +01:00
Love Nyberg
75a1f888eb 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 from westurner/fix-nested-_roots
Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: )
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  "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
Kenneth Wilke
92b2572734 newline fix 2013-08-23 11:54:12 -05:00
Kenneth Wilke
153feac309 Edited master template
made fileserver_backend and gitfs_remotes look more like expected
2013-08-23 11:52:46 -05:00
Kenneth Wilke
a14ded0b6e really more gentoo 2013-08-15 10:16:54 -05:00
Kenneth Wilke
5c3ffbd43c added salt package mapping for gentoo 2013-08-15 10:15:47 -05:00
Kenneth Wilke
48e2e326b2 fixed missing curly brackets 2013-08-14 16:21:15 -05:00
Kenneth Wilke
fc9db5336a added moar distro package mapping 2013-08-14 16:16:50 -05:00
Kenneth Wilke
a6667cdb81 Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
2013-08-14 14:53:29 -05:00
Kenneth Wilke
2420b85913 overhauled minion template 2013-08-14 09:43:46 -05:00
Kenneth Wilke
2d598ac2ef corrected spelling mistake 2013-08-13 16:17:53 -05:00
Kenneth Wilke
539d210896 Overhauled the master template 2013-08-13 16:00:08 -05:00
Kenneth Wilke
be1cd4ff73 Overhauled master config template 2013-08-13 15:57:58 -05:00
Kenneth Wilke
3634e3d833 removed bad require line 2013-08-12 17:36:36 -05:00
Kenneth Wilke
b9d2e2f9d4 changed salt-master package to salt-master 2013-08-12 17:33:28 -05:00
Kenneth Wilke
76684f638d changed master require to watch, and both to salt-master 2013-08-12 17:33:02 -05:00
Kenneth Wilke
b1903eea83 fixed log format string 2013-08-12 17:10:45 -05:00
Kenneth Wilke
d0df360e5d Removed template refs, quoted log_datefmt_logfile 2013-08-12 16:45:39 -05:00
Kenneth Wilke
5403d433a1 fixed small syntax error: geT instead of get 2013-08-12 15:14:23 -05:00
Thomas S Hatch
fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Colton Myers
46652ebfda Move everything to root directory for submodule use, Fix 2013-07-17 09:35:39 -06:00
Antoine Cezar
0c394abad1 Add minion managed file 2013-07-15 15:08:54 +02:00
Ari Lerner
91330d170d Added small readme 2013-06-18 00:18:10 -07:00
Ari Lerner
3ff270fe9f Added the entire master configuration to be set in the pillar 2013-06-18 00:17:04 -07:00
Thomas S Hatch
6a7f64c5ec Start to paramaterize the master config 2013-06-12 22:42:44 -04:00
Thomas S Hatch
349a077675 Start on salt formula 2013-06-12 17:53:26 -06:00