CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

cant get grains.filter_by to work for some reason

Browse Source
This commit is contained in:
m0duspwnens
2020-07-31 13:25:37 -04:00
parent d7ad2fbfd7
commit 1e1d6a395d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
salt/salt/map.jinja
View File

@@ -1,10 +1,11 @@
{% import_yaml 'salt/minion.defaults.yaml' as salt %} {% import_yaml 'salt/minion.defaults.yaml' as salt %}
{% set SALTVERSION = salt.salt.minion.version %} {% set SALTVERSION = salt.salt.minion.version %}
{% set SALTPACKAGES = salt['grains.filter_by']({ {% if grains.os|lower == 'ubuntu' %}
'Ubuntu': {'common': 'salt-common'}, {% set COMMON = 'salt-common' %}
'Centos': {'common': 'salt'}, {% elif grains.os|lower == 'centos' %}
}) %} {% set COMMON = 'salt' %}
{% endif %}
{% if grains.saltversion|string != SALTVERSION|string %} {% if grains.saltversion|string != SALTVERSION|string %}
{% if grains.os|lower == 'centos' %} {% if grains.os|lower == 'centos' %}

4
salt/salt/minion.sls
View File

@@ -1,4 +1,4 @@
{% from 'salt/map.jinja' import SALTPACKAGES with context %} {% from 'salt/map.jinja' import COMMON with context %}
{% from 'salt/map.jinja' import UPGRADECOMMAND with context %} {% from 'salt/map.jinja' import UPGRADECOMMAND with context %}
include: include:
@@ -16,7 +16,7 @@ install_salt_minion:
salt_minion_package: salt_minion_package:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- {{ SALTPACKAGES.common }} - {{ COMMON }}
- salt-minion - salt-minion
- hold: True - hold: True