From a662badc5bd46e914759d6d394420d938c40e4d9 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Thu, 13 Dec 2018 23:52:15 +0000 Subject: [PATCH] Firewall - Fix stuff for sensor --- salt/firewall/init.sls | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls index 34e69739f..18d0c814d 100644 --- a/salt/firewall/init.sls +++ b/salt/firewall/init.sls @@ -1,19 +1,11 @@ # Firewall Magic for the grid - -{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %} - +{%- if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %} {%- set ip = salt['pillar.get']('static:masterip', '') %} - -{% elif grains['role'] == 'so-node'%} - +{%- elif grains['role'] == 'so-node' %} {%- set ip = salt['pillar.get']('node:mainip', '') %} - -{% elif grains['role'] == 'so-sensor'%} - -{%- set ip = salt['pillar.get']('node:mainip', '') %} - -{% endif %} - +{%- elif grains['role'] == 'so-sensor' %} +{%- set ip = salt['pillar.get']('sensor:mainip', '') %} +{%- endif %} # Keep localhost in the game iptables_allow_localhost: iptables.append: