From 48549cdd83ce8d9c4770a70e08bfaf17120feace Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 8 Apr 2020 17:02:33 -0400 Subject: [PATCH] [fix] NetworkManager dir should not be string --- salt/_modules/telegraf.py | 2 +- setup/so-functions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/_modules/telegraf.py b/salt/_modules/telegraf.py index ee564a44d..6fa33f89a 100644 --- a/salt/_modules/telegraf.py +++ b/salt/_modules/telegraf.py @@ -6,7 +6,7 @@ import socket def send(data): - mainint = __salt__['pillar.get']('node:mainint') + mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('master:mainint')) mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0] dstport = 8094 diff --git a/setup/so-functions b/setup/so-functions index 3d27df17b..539bfe7a5 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -842,8 +842,8 @@ network_setup() { nmcli con mod "$MAININT" connection.autoconnect "yes"; fi - echo "... Copying 99-so-checksum-offload-disable"; - cp "$./install_scripts/99-so-checksum-offload-disable" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ; + echo "... Copying 99-so-checksum-offload-disable"; + cp "$SCRIPTDIR"/install_scripts/99-so-checksum-offload-disable /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ; echo "... Modifying 99-so-checksum-offload-disable"; sed -i "s/\$MAININT/${MAININT}/g" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable;