mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
remove by package name not wildcard
This commit is contained in:
@@ -4,9 +4,11 @@
|
|||||||
{% if grains.os == 'Ubuntu' %}
|
{% if grains.os == 'Ubuntu' %}
|
||||||
{% set SPLITCHAR = '+' %}
|
{% set SPLITCHAR = '+' %}
|
||||||
{% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep -q salt ; echo $?', python_shell=True) %}
|
{% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep -q salt ; echo $?', python_shell=True) %}
|
||||||
|
{% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion'] %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set SPLITCHAR = '-' %}
|
{% set SPLITCHAR = '-' %}
|
||||||
{% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep -q salt ; echo $?', python_shell=True) %}
|
{% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep -q salt ; echo $?', python_shell=True) %}
|
||||||
|
{% set SALTPACKAGES = ['salt', 'salt-master', 'salt-minion'] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %}
|
{% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
{% from 'salt/map.jinja' import SALTVERSION %}
|
{% from 'salt/map.jinja' import SALTVERSION %}
|
||||||
{% from 'salt/map.jinja' import INSTALLEDSALTVERSION %}
|
{% from 'salt/map.jinja' import INSTALLEDSALTVERSION %}
|
||||||
{% from 'salt/map.jinja' import SALTNOTHELD %}
|
{% from 'salt/map.jinja' import SALTNOTHELD %}
|
||||||
|
{% from 'salt/map.jinja' import SALTPACKAGES %}
|
||||||
{% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %}
|
{% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %}
|
||||||
{% set service_start_delay = SALTMINION.salt.minion.service_start_delay %}
|
{% set service_start_delay = SALTMINION.salt.minion.service_start_delay %}
|
||||||
|
|
||||||
@@ -15,7 +16,10 @@ include:
|
|||||||
unhold_salt_packages:
|
unhold_salt_packages:
|
||||||
module.run:
|
module.run:
|
||||||
- pkg.unhold:
|
- pkg.unhold:
|
||||||
- name: 'salt-*'
|
- pkgs:
|
||||||
|
{% for package in SALTPACKAGES %}
|
||||||
|
- {{ package }}
|
||||||
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
install_salt_minion:
|
install_salt_minion:
|
||||||
@@ -33,7 +37,10 @@ install_salt_minion:
|
|||||||
hold_salt_packages:
|
hold_salt_packages:
|
||||||
module.run:
|
module.run:
|
||||||
- pkg.hold:
|
- pkg.hold:
|
||||||
- name: 'salt-*'
|
- pkgs:
|
||||||
|
{% for package in SALTPACKAGES %}
|
||||||
|
- {{ package }}
|
||||||
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
set_log_levels:
|
set_log_levels:
|
||||||
|
|||||||
Reference in New Issue
Block a user