From ff5773c8379d140cb6a239e89f4dd48672b15f7e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 5 Jun 2024 08:56:32 -0400 Subject: [PATCH] move so-tcpreplay back to common. return empty string if no sensor.interface pillar --- .../tools/sbin_jinja/so-tcpreplay | 2 +- salt/sensor/init.sls | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) rename salt/{sensor => common}/tools/sbin_jinja/so-tcpreplay (96%) diff --git a/salt/sensor/tools/sbin_jinja/so-tcpreplay b/salt/common/tools/sbin_jinja/so-tcpreplay similarity index 96% rename from salt/sensor/tools/sbin_jinja/so-tcpreplay rename to salt/common/tools/sbin_jinja/so-tcpreplay index a9551c0fa..969ca699f 100755 --- a/salt/sensor/tools/sbin_jinja/so-tcpreplay +++ b/salt/common/tools/sbin_jinja/so-tcpreplay @@ -10,7 +10,7 @@ . /usr/sbin/so-common . /usr/sbin/so-image-common -REPLAYIFACE=${REPLAYIFACE:-"{{pillar.sensor.interface}}"} +REPLAYIFACE=${REPLAYIFACE:-"{{salt['pillar.get']('sensor:interface', '')}}"} REPLAYSPEED=${REPLAYSPEED:-10} mkdir -p /opt/so/samples diff --git a/salt/sensor/init.sls b/salt/sensor/init.sls index ca1cf13c2..c9c6a6db5 100644 --- a/salt/sensor/init.sls +++ b/salt/sensor/init.sls @@ -10,20 +10,4 @@ execute_checksum: - name: /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable - onchanges: - file: offload_script - -sensor_sbin: - file.recurse: - - name: /usr/sbin - - source: salt://sensor/tools/sbin - - user: 939 - - group: 939 - - file_mode: 755 - -sensor_sbin_jinja: - file.recurse: - - name: /usr/sbin - - source: salt://sensor/tools/sbin_jinja - - user: 939 - - group: 939 - - file_mode: 755 - - template: jinja + \ No newline at end of file