diff --git a/salt/launcher/init.sls b/salt/launcher/init.sls index 7367f39f0..f8767654e 100644 --- a/salt/launcher/init.sls +++ b/salt/launcher/init.sls @@ -1,6 +1,6 @@ {%- set FLEETSETUP = salt['pillar.get']('static:fleetsetup', '0') -%} -{%- if FLEETSETUP != '0' %} +{%- if FLEETSETUP != 0 %} launcherpkg: pkg.installed: - sources: diff --git a/so-setup-network.sh b/so-setup-network.sh index ad77c492a..461946694 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -319,7 +319,7 @@ create_bond() { echo "iface $BNIC inet manual" >> /etc/network/interfaces.d/$BNIC echo " up ip link set \$IFACE promisc on arp off up" >> /etc/network/interfaces.d/$BNIC echo " down ip link set \$IFACE promisc off down" >> /etc/network/interfaces.d/$BNIC - echo " post-up ethtool -G \$IFACE rx 4096; for i in rx tx sg tso ufo gso gro lro; do ethtool -K \$IFACE \$i off; done" >> /etc/network/interfaces.d/$BNIC + echo " post-up for i in rx tx sg tso ufo gso gro lro; do ethtool -K \$IFACE \$i off; done" >> /etc/network/interfaces.d/$BNIC echo " post-up echo 1 > /proc/sys/net/ipv6/conf/\$IFACE/disable_ipv6" >> /etc/network/interfaces.d/$BNIC echo " bond-master bond0" >> /etc/network/interfaces.d/$BNIC echo " mtu $MTU" >> /etc/network/interfaces.d/$BNIC @@ -335,7 +335,7 @@ create_bond() { echo " mtu $MTU" >> /etc/network/interfaces.d/bond0 echo " up ip link set \$IFACE promisc on arp off up" >> /etc/network/interfaces.d/bond0 echo " down ip link set \$IFACE promisc off down" >> /etc/network/interfaces.d/bond0 - echo " post-up ethtool -G \$IFACE rx 4096; for i in rx tx sg tso ufo gso gro lro; do ethtool -K \$IFACE \$i off; done" >> /etc/network/interfaces.d/bond0 + echo " post-up for i in rx tx sg tso ufo gso gro lro; do ethtool -K \$IFACE \$i off; done" >> /etc/network/interfaces.d/bond0 echo " post-up echo 1 > /proc/sys/net/ipv6/conf/\$IFACE/disable_ipv6" >> /etc/network/interfaces.d/bond0 fi