diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index cb24cc85e..7b32b9841 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -4,9 +4,11 @@ {% if grains.os == 'Ubuntu' %} {% set SPLITCHAR = '+' %} {% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep -q salt ; echo $?', python_shell=True) %} + {% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion'] %} {% else %} {% set SPLITCHAR = '-' %} {% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep -q salt ; echo $?', python_shell=True) %} + {% set SALTPACKAGES = ['salt', 'salt-master', 'salt-minion'] %} {% endif %} {% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %} diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 633e1496d..1a172d851 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -2,6 +2,7 @@ {% from 'salt/map.jinja' import SALTVERSION %} {% from 'salt/map.jinja' import INSTALLEDSALTVERSION %} {% from 'salt/map.jinja' import SALTNOTHELD %} +{% from 'salt/map.jinja' import SALTPACKAGES %} {% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %} {% set service_start_delay = SALTMINION.salt.minion.service_start_delay %} @@ -15,7 +16,10 @@ include: unhold_salt_packages: module.run: - pkg.unhold: - - name: 'salt-*' + - pkgs: +{% for package in SALTPACKAGES %} + - {{ package }} +{% endfor %} {% endif %} install_salt_minion: @@ -33,7 +37,10 @@ install_salt_minion: hold_salt_packages: module.run: - pkg.hold: - - name: 'salt-*' + - pkgs: +{% for package in SALTPACKAGES %} + - {{ package }} +{% endfor %} {% endif %} set_log_levels: