Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-01 06:21:18 +01:00
Code Issues Activity
195 Commits 3 Branches 68 Tags 2.4 MiB
ae8e4ca492
Commit Graph

110 Commits

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