CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-01-30 03:43:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7320 from Security-Onion-Solutions/delta_ssh

Browse Source 
default to false if local role doesnt exist
This commit is contained in:
Josh Patterson
2022-02-24 18:06:19 -05:00
committed by GitHub
parent e8e683c2e9 0970bbc983
commit 8302c45059
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/firewall/map.jinja
View File

@@ -37,7 +37,7 @@
{% import_yaml 'firewall/assigned_hostgroups.map.yaml' as default_assigned_hostgroups %}
{% import_yaml 'firewall/assigned_hostgroups.local.map.yaml' as local_assigned_hostgroups %}
{% if local_assigned_hostgroups.role[role] %}
{% if local_assigned_hostgroups.role.get(role, False) %}
{% set assigned_hostgroups = salt['defaults.merge'](local_assigned_hostgroups.role[role], default_assigned_hostgroups.role[role], merge_lists=False, in_place=False) %}
{% else %}
{% set assigned_hostgroups = default_assigned_hostgroups.role[role] %}
@@ -45,4 +45,4 @@
{% if translated_pillar_assigned_hostgroups %}
{% do salt['defaults.merge'](assigned_hostgroups, translated_pillar_assigned_hostgroups, merge_lists=True, in_place=True) %}
{% endif %}
{% endif %}