From c68b87db566021d35e6624c53501a4fed6f46be1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 16 Dec 2020 09:33:44 -0500 Subject: [PATCH 1/3] set steno running default based on sensor role or not --- salt/sensoroni/files/sensoroni.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json index 55b928ef0..2e64dd2a6 100644 --- a/salt/sensoroni/files/sensoroni.json +++ b/salt/sensoroni/files/sensoroni.json @@ -3,7 +3,13 @@ {% set ADDRESS = salt['pillar.get']('sensoroni:node_address') -%} {% set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') -%} {% set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) -%} -{% set STENOENABLED = salt['pillar.get']('steno:enabled', False) -%} +{%- set ROLE = grains.id.split('_') | last %} +{%- if ROLE in ['eval', 'standalone', 'sensor', 'heavynode'] %} +{%- set STENODEFAULT = True %} +{%- else %} +{%- set STENODEFAULT = False %} +{%- endif } +{%- set STENOENABLED = salt['pillar.get']('steno:enabled', STENODEFAULT) %} { "logFilename": "/opt/sensoroni/logs/sensoroni.log", "logLevel":"info", From f0999abd8ec78481f4ac15ea149eded2dc646098 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 16 Dec 2020 09:38:21 -0500 Subject: [PATCH 2/3] add missing % --- salt/sensoroni/files/sensoroni.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json index 2e64dd2a6..ac4762b12 100644 --- a/salt/sensoroni/files/sensoroni.json +++ b/salt/sensoroni/files/sensoroni.json @@ -8,7 +8,7 @@ {%- set STENODEFAULT = True %} {%- else %} {%- set STENODEFAULT = False %} -{%- endif } +{%- endif %} {%- set STENOENABLED = salt['pillar.get']('steno:enabled', STENODEFAULT) %} { "logFilename": "/opt/sensoroni/logs/sensoroni.log", From 448d0e079eca4bc504ecffa42c38abd7cf551450 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 16 Dec 2020 09:39:25 -0500 Subject: [PATCH 3/3] add whitespace removal to the front --- salt/sensoroni/files/sensoroni.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json index ac4762b12..23b967b04 100644 --- a/salt/sensoroni/files/sensoroni.json +++ b/salt/sensoroni/files/sensoroni.json @@ -1,8 +1,8 @@ -{% set URLBASE = salt['pillar.get']('global:url_base') -%} -{% set DESCRIPTION = salt['pillar.get']('sensoroni:node_description') -%} -{% set ADDRESS = salt['pillar.get']('sensoroni:node_address') -%} -{% set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') -%} -{% set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) -%} +{%- set URLBASE = salt['pillar.get']('global:url_base') %} +{%- set DESCRIPTION = salt['pillar.get']('sensoroni:node_description') %} +{%- set ADDRESS = salt['pillar.get']('sensoroni:node_address') %} +{%- set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') %} +{%- set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) %} {%- set ROLE = grains.id.split('_') | last %} {%- if ROLE in ['eval', 'standalone', 'sensor', 'heavynode'] %} {%- set STENODEFAULT = True %}