359 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imran Iqbal	7f36259614	Remove excessive blank lines rendered after "Miscellaneous settings"	2016-03-04 11:50:36 +00:00
Imran Iqbal	c4e116ee8f	Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions	2016-03-04 11:50:33 +00:00
Imran Iqbal	7474d4239d	Fix Windows repo settings using values from 2015.8 documentation	2016-03-04 11:50:26 +00:00
Nitin Madhok	043433b90a	Merge pull request #204 from aboe76/master ... update 2015.8.7 version config for the minion	2016-02-20 18:11:57 -05:00
Niels Abspoel	a4c5b4f322	update 2015.8.7 version config for the minion	2016-02-20 23:25:06 +01:00
Forrest	a8ced2e98f	Merge pull request #203 from aboe76/master_config_2015.8.7 ... merge options from 2015.8.7 version in f_defaults.conf	2016-02-20 13:26:15 -08:00
Niels Abspoel	bfcaca38a6	merge options from 2015.8.7 version in f_defaults.conf	2016-02-20 21:07:17 +01:00
Forrest	8573ba96e2	Merge pull request #202 from irtnog/revert-pr200 ... Revert PR #200	2016-02-16 11:42:57 -08:00
Matthew X. Economou	e8021220b8	Revert PR #200 ... This restores the original structure/behavior of the `salt_formulas` Pillar key.	2016-02-16 10:20:42 -05:00
Forrest	b47fec3564	Merge pull request #200 from thomaslarsen/master ... Support for downloading formulas from multiple baseurls into same environment	2016-02-08 11:06:29 -08:00
Thomas Larsen	bbeacc4ace	Fixed typo in pillar.example	2016-02-08 14:01:47 +00:00
Thomas Larsen	d1cbec3fe2	Added support for downloading formulas from multiple baseurls into the same environment.	2016-02-08 13:45:09 +00:00
Forrest	337c48b14c	Merge pull request #199 from kevinschmidt/master ... add consul config support to master config file	2016-01-19 11:31:28 -08:00
Kevin Schmidt	ce6849247e	add consul config support	2016-01-19 16:54:05 +00:00
Forrest	0fee3f58f2	Merge pull request #196 from iamseth/master ... Replace pkgrepo with offical Saltstack repo	2016-01-17 20:07:50 -08:00
Forrest	8617db1536	Merge pull request #198 from kevinschmidt/master ... add support for gitfs whitelist and blacklist	2016-01-13 11:35:56 -08:00
Kevin Schmidt	41f2de74bd	* add gitfs whitelist and blacklist	2016-01-13 11:48:27 +00:00
Niels Abspoel	adb0c7008d	removing accidentally committed files	2016-01-09 21:45:23 +01:00
Niels Abspoel	cbe5763668	fix pillar and libvirt	2016-01-09 19:39:47 +01:00
Seth Miller	8f2191471b	Replace pkgrepo with offical Saltstack repo ... issue #180	2016-01-08 11:21:22 -06:00
Forrest	46346e935f	Merge pull request #195 from vexxhost/master ... Dropped ppa and updated to official repos for ubuntu	2015-12-24 13:09:36 -08:00
Mohammed Naser	3b8669cd67	dropped ppa and updated to official repos for ubuntu	2015-12-24 13:28:35 -05:00
Forrest	ad009a68e3	Merge pull request #194 from msciciel/master ... Add support for returner configuration in salt minion	2015-12-21 11:57:53 -08:00
msciciel	f1c941a6a8	Merge pull request #1 from msciciel/github ... Add support for returner configuration in salt minion	2015-12-21 15:17:44 +01:00
Krzysztof Pawłowski	02be0b1367	add support for returner setting in minion configuration	2015-12-21 15:00:35 +01:00
Krzysztof Pawłowski	422888cf77	Merge branch 'github' into itg ... Conflicts: salt/formulas.jinja	2015-12-21 14:55:21 +01:00
Wolodja Wentland	5d1368d936	Merge pull request #192 from hemebond/master ... Add clean_file to wipe saltstack.list contents	2015-12-09 19:20:13 +01:00
James O'Neill	6d9683ca1f	Add clean_file to wipe saltstack.list contents	2015-12-09 23:33:00 +13:00
Forrest	d58729e6c1	Merge pull request #191 from hemebond/master ... Make Debian use pkgrepo.managed	2015-12-05 12:53:45 -08:00
James O'Neill	87f3e849d2	Make Debian use pkgrepo.managed and allow the repo name and key_url to be overridden via Pillar lookup.	2015-12-05 23:24:05 +13:00
Forrest	b00844fbe4	Merge pull request #189 from Sjd-Risca/test ... fixed ext_pillar and master_tops to get more options	2015-11-18 11:08:46 -08:00
risca	3a83533669	fixed ext_pillar according to https://docs.saltstack.com/en/latest/topics/development/external_pillars.html#configuration and master_tops according to https://docs.saltstack.com/en/latest/topics/master_tops/index.html	2015-11-18 19:59:16 +01:00
Forrest	a33937d9e8	Merge pull request #188 from abednarik/fix_deprecated_iteritems_method ... Replace deprecated iteritems() with items()	2015-11-16 18:34:28 -08:00
abednarik	8b39b37762	Replace deprecated iteritems() with items()	2015-11-16 22:05:36 -03:00
Forrest	5c960fd2d8	Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion ... Never fall back to `cfg_salt['master']` in minion config	2015-11-15 12:19:51 -08:00
Devon Stewart	d730d4f2b8	Using cfg_salt['master'] is never the right answer ... - When it's iterable, the minion could be running on the master - When it's a string, there's no advantage over just specifying `salt:minion:master`	2015-11-15 12:11:20 -08:00
Forrest	eeb7235ee0	Merge pull request #184 from 0xf10e/master ... use salt_settings.syndic_service so state works on FreeBSD, too	2015-11-04 12:26:06 -08:00
Forrest	8d1b382343	Merge pull request #183 from babilen/dev-show-jid ... Manage show_jid option in master configuration	2015-10-13 12:00:56 -07:00
puneet kandhari	52803ea883	Merge pull request #185 from babilen/dev-trailing-whitespace ... Remove trailing whitespace from master config	2015-10-13 09:09:51 -07:00
Wolodja Wentland	0216d66527	Remove trailing whitespace from master config	2015-10-13 16:37:14 +02:00
root	d7382e2d1f	use salt_settings.syndic_service so state works on FreeBSD, too	2015-10-13 15:41:41 +02:00
Wolodja Wentland	52893bc978	Manage show_jid in master configuration ... This makes it easier for users to check the status of jobs that ran into a timeout.	2015-10-13 14:56:51 +02:00
puneet kandhari	8d098484ed	Merge pull request #164 from genuss/sign_pubkey ... Add master_type option	2015-09-29 09:44:14 -07:00
Brian Jackson	32d2de264f	Merge pull request #176 from irtnog/fix-formulas-mapping-values-not-allowed-render-error ... Filter all calls to formulas_git_opt through load_yaml	2015-09-03 14:28:56 -05:00
Matthew X. Economou	827ed47a25	Filter all calls to formulas_git_opt through load_yaml ... Jinja macros are not actually functions. The only thing they can return is a string. In order to return structured data, the callee must serialize it, and the caller must deserialize it. This state formula uses YAML as the intermediary, hence the occurrence of both the `|yaml` (callee) and `|load_yaml` (caller) filters in its code. The post-render "mapping values are not allowed here" error in *salt/formulas.sls* or the broken rendering of *salt/files/master.d/f_defaults.conf* happens because invocations of the `formulas_git_opt` macro in several Jinja `set` statements do not get deserialized, resulting in the trailing newline followed by three dot characters (`...`), which YAML uses to signal the end of a document. Correcting these rendering errors requires adding the necessary deserialization code at those locations (i.e., filtering the macro call through `|load_yaml`).	2015-09-03 14:56:45 -04:00
puneet kandhari	4983fc52e9	Merge pull request #174 from spoage/fix-git-id-conflict ... Fixed conflict with git-formula	2015-09-02 09:02:06 -05:00
Shane Poage	f0e691fa13	Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.	2015-09-01 18:33:18 -05:00
Forrest	c2d6e0e49b	Merge pull request #173 from iggy/remove-mapping-test ... Remove mapping test	2015-08-27 16:28:27 -07:00
Brian Jackson	9779609bc4	Remove mapping test ... This test isn't available in certain popular versions of Jinja (namely the one installed by default in CentOS 6).	2015-08-27 17:37:53 -05:00
Forrest	4c4ace6d55	Merge pull request #171 from spoage/better-pygit2-install ... Improve flexibility/quality of pygit2 state	2015-08-20 10:28:07 -07:00