mirror of
https://github.com/saltstack-formulas/salt-formula.git
synced 2026-10-08 22:48:14 +02:00
Merge pull request #331 from chessclub/fix-inotify-beacon-dependency
Added support for installing pyinotify when using inotify beacons
This commit is contained in:
commit
413a2eae30
3 files changed
+13
No files matched your search
@@ -47,6 +47,7 @@ that differ from whats in defaults.yaml
|
||||
salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease)|string + '/amd64/' + salt_release + ' ' + salt['grains.get']('oscodename') + ' main',
|
||||
'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease)|string + '/amd64/' + salt_release + '/SALTSTACK-GPG-KEY.pub',
|
||||
'libgit2': 'libgit2-22',
|
||||
'pyinotify': 'python-pyinotify',
|
||||
'gitfs': {
|
||||
'pygit2': {
|
||||
'install_from_source': True,
|
||||
@@ -99,6 +100,7 @@ that differ from whats in defaults.yaml
|
||||
'salt_ssh': 'salt',
|
||||
'pygit2': 'python2-pygit2',
|
||||
'libgit2': 'libgit2',
|
||||
'pyinotify': 'python2-pyinotify',
|
||||
},
|
||||
'Alpine': {
|
||||
'salt_master': 'salt-master',
|
||||
|
||||
@@ -63,6 +63,16 @@ restart-salt-minion:
|
||||
- file: remove-old-minion-conf-file
|
||||
{%- endif %}
|
||||
|
||||
{% if 'inotify' in salt_settings.get('minion', {}).get('beacons', {}) and salt_settings.get('pyinotify', False) %}
|
||||
salt-minion-beacon-inotify:
|
||||
pkg.installed:
|
||||
- name: {{ salt_settings.pyinotify }}
|
||||
- require_in:
|
||||
- service: salt-minion
|
||||
- watch_in:
|
||||
- service: salt-minion
|
||||
{% endif %}
|
||||
|
||||
{% if salt_settings.minion_remove_config %}
|
||||
remove-default-minion-conf-file:
|
||||
file.absent:
|
||||
|
||||
Reference in new issue
Block a user