Browse Source

Added support for installing pynotify when inotify beacons are configuredwq

tags/v0.57.0
Tibold 7 years ago
parent
commit
e94f15d0fe
3 changed files with 12 additions and 0 deletions
  1. +1
    -0
      pillar.example
  2. +1
    -0
      salt/map.jinja
  3. +10
    -0
      salt/minion.sls

+ 1
- 0
pillar.example View File

@@ -21,6 +21,7 @@ salt:
salt-syndic: 'salt-syndic'
salt-cloud: 'salt-cloud'
salt-ssh: 'salt-ssh'
pyinotify: 'python-pyinotify' the package to be installed for pyinotify

# Set which release of SaltStack to use, default to 'latest'
# To get the available releases:

+ 1
- 0
salt/map.jinja View File

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

+ 10
- 0
salt/minion.sls View File

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

Loading…
Cancel
Save