Tibold
80a160a810
Added default pyinotify package name for archlinux.
2017-08-16 07:20:00 +00:00
Tibold
e94f15d0fe
Added support for installing pynotify when inotify beacons are configuredwq
2017-08-15 20:48:15 +00:00
Niels Abspoel
8ad2bb6a80
Merge pull request #325 from mechleg/minion-restart
...
adding salt-minion restart option from official FAQ page
2017-08-08 22:23:23 +02:00
Niels Abspoel
3d8f2f6c42
Merge pull request #328 from saltstack-formulas/fix-pillar-example
...
Corrected salt:release in pillar.example
2017-08-07 20:15:12 +02:00
Alexander Weidinger
7e8df76e28
Corrected salt:release in pillar.example
...
Fixes 'TypeError: coercing to Unicode: need string or buffer, float found'
2017-08-07 17:49:44 +02:00
Niels Abspoel
e307b0cd53
Merge pull request #327 from arthurlogilab/patch-2
...
[pillar.example] fix indentation of reactors examples
2017-08-04 14:04:15 +02:00
Arthur Lutz
0467074e28
[pillar.example] fix indentation of reactors examples
2017-08-04 11:44:06 +02:00
mechleg
e8ef3c1446
adding salt-minion restart option from official FAQ page
2017-07-27 13:15:21 -07:00
Niels Abspoel
9cf5cd2c00
Merge pull request #319 from genuss/restart_via_at
...
Add restart minion via at (fixes #136 )
2017-07-26 21:45:25 +02:00
Niels Abspoel
c265206e94
Merge pull request #323 from aquto/master
...
Enable option to set minion scheduler
2017-07-25 16:37:25 +02:00
Elliot Chen
ec8241c6fd
Added minion scheduler configuration
2017-07-25 10:13:51 -04:00
Niels Abspoel
96edba24fe
Merge pull request #322 from matthew-parlette/master
...
Fix map.jinja to work with 2017.7.0
2017-07-21 16:47:03 +02:00
Matthew Parlette
4437f7b2e1
Fixed map.jinja to work with 2017.7.0
2017-07-18 16:18:44 -04:00
Niels Abspoel
9e7bcd5946
Merge pull request #320 from tampakrap/enable_syndic_service
...
enable the syndic service
2017-06-29 13:14:36 +02:00
Theo Chatzimichos
27c69a8a93
enable the syndic service
2017-06-29 13:05:15 +02:00
Florian Ermisch
739be9550f
Merge pull request #316 from cmclaughlin/remove-env-comments
...
Remove "source" comments from Saltify configs
2017-06-16 12:17:20 +02:00
a.genus
0e8573d13a
Fix typo
2017-06-15 13:30:30 +03:00
a.genus
22ad7db7c0
Add restart minion via at ( fixes #136 )
2017-06-14 19:28:11 +03:00
Niels Abspoel
826bf6695e
Merge pull request #318 from netmanagers/master
...
Fix lists join error (#317 )
2017-06-09 22:42:51 +02:00
Javier Bértoli
b8273b9c3f
Fix lists join error ( #317 )
2017-06-09 08:34:55 -03:00
Charles McLaughlin
3a261c7da0
Update comment for consistency
2017-06-07 14:55:25 -07:00
Charles McLaughlin
316622ef9b
Remove "source" comments from Saltify configs
...
I use Salt environments to provide each of my team mates the ability to develop
and test their Salt changes. And I've found that when we run this formula from
our environments against our salt-master, comments in some files change. For us
this represents an unwanted and unplanned change. I understand the intention -
to identify how or why the file changed, but I firmly believe that we should
be able to run highstsate with test=True and only see intended changes. Here's
an example:
ID: salt-cloud-providers
Function: file.recurse
Name: /etc/salt/cloud.providers.d
Result: None
Comment: #### /etc/salt/cloud.providers.d/saltify.conf ####
The file /etc/salt/cloud.providers.d/saltify.conf is set to be changed
Started: 20:01:28.586441
Duration: 75.185 ms
Changes:
----------
/etc/salt/cloud.providers.d/saltify.conf:
----------
diff:
---
+++
@@ -1,4 +1,4 @@
-# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=myenv
+# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=dev
saltify:
provider: saltify
2017-06-07 13:39:35 -07:00
Niels Abspoel
83433c8dd8
Merge pull request #312 from netmanagers/master
...
Allow to specify reactors separatedly for master and minions
2017-06-03 19:28:05 +02:00
Niels Abspoel
be266a180c
Merge pull request #314 from kakwa/ADD_SALT_REALEASE
...
add a way to set which release of saltstack to use
2017-05-31 23:15:30 +02:00
Carpentier Pierre-Francois
5c3dc73f2a
fix map.jinja
...
add missing comas
2017-05-31 22:53:48 +02:00
carpenti
6622d177bf
add a way to set which release of saltstack to use
...
SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.
It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.
The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.
2017-05-30 09:18:54 +02:00
Javier Bértoli
9331997269
Exclude reactors from f_defaults.conf
2017-05-22 20:56:13 -03:00
Javier Bértoli
3a1e7ad9f9
Fix reactor examples
2017-05-22 20:52:48 -03:00
Javier Bértoli
561eb4c5c8
Reactors should be in an array
2017-05-22 19:34:31 -03:00
Javier Bértoli
442806ab9e
Allow to specify different reactors for minions and masters
2017-05-22 19:20:36 -03:00
Niels Abspoel
eaf9fc98f6
Merge pull request #307 from M2Mobi/external_auth
...
Fix rendering of external_auth config.
2017-05-10 21:24:19 +02:00
Heinz Wiesinger
68a2b72519
Fix rendering of external_auth config.
...
This now properly also supports per user, per minion as well as
function argument limiting.
2017-05-09 13:34:44 +02:00
Nitin Madhok
eb09c3bdc6
Merge pull request #305 from EvaSDK/salt-cloud-cleanups
...
salt-cloud handling cleanups
2017-04-23 12:47:31 -04:00
Gilles Dartiguelongue
87074cf3d9
Do not sync salt-cloud provided default configuration by default
...
As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
2017-04-11 13:54:05 +02:00
Gilles Dartiguelongue
4b29379725
Rework salt-cloud directories and files creation
...
Since the set of directories is known, just iterate of its well known
names directly. Make sure files are dumped after `file.recurse` to avoid
deletion/creation cycles when applying highstate.
Also apply permissions on cloud.providers.d after all creations steps
are done.
2017-04-11 13:34:50 +02:00
Gilles Dartiguelongue
dce9bea40b
Compact salt-cloud pip.installed instructions
2017-04-11 13:34:50 +02:00
Niels Abspoel
85597b3326
Merge pull request #306 from netmanagers/master
...
Wrong list name in config file
2017-04-10 19:35:19 +02:00
Javier Bértoli
7093a32968
Simplify logic
2017-04-10 12:14:12 -03:00
Javier Bértoli
997194c992
Wrong list name in config file
2017-04-10 12:11:09 -03:00
Nitin Madhok
64925e902c
Merge pull request #304 from netmanagers/master
...
Updated minion and master config files to 2016.11
2017-04-10 10:04:38 -04:00
Javier Bértoli
edce95f949
Updated master and minion default config files
...
Added parameters new to 2016.03 (or simply missing in the existing config).
2017-04-09 14:27:30 -03:00
Niels Abspoel
03ec0dce2d
Merge pull request #301 from vquiering/move_to_publisher_acl
...
Add new publisher_acl to salt master config
2017-04-08 12:05:15 +02:00
Niels Abspoel
ca204ea8c4
Merge pull request #302 from vquiering/fix_external_auth_config
...
add salt master config template external_auth settings
2017-04-08 12:04:57 +02:00
Niels Abspoel
4b5ea5a544
Merge pull request #303 from tampakrap/syndic_user
...
add syndic_user option in the master config
2017-04-07 13:14:58 +02:00
Theo Chatzimichos
57498d1645
add syndic_user option in the master config
2017-04-07 12:12:21 +02:00
Vitali Quiering
f7189e2900
User publisher_acl setting in salt master config even if used client_acl in
...
pillar (backwards compatibility)
2017-03-27 08:39:05 +02:00
Vitali Quiering
894bd15c79
fix salt master config template to use external_auth settings
2017-03-25 19:59:16 +01:00
Vitali Quiering
d3b46a3648
add publisher_acl to salt master config
2017-03-24 13:07:19 +01:00
puneet kandhari
31229c5a0d
Merge pull request #298 from 0xf10e/no_mapping_workaround
...
Hack to make rendering work on CentOS 6
2017-03-04 05:17:38 -06:00
Florian Ermisch
e86e6fc221
Work around missing is mapping
on CentOS/RHEL 6
...
Checks for 'dict' in `x.__class__.__name__` b/c
neither `type()` nor `isinstance()` is available.
2017-02-24 18:10:54 +01:00