diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 8cb8fc6f5..95ca60b95 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -600,9 +600,13 @@ up_to_2.4.70() { toggle_telemetry add_detection_test_pillars + INSTALLEDVERSION=2.4.70 +} + +up_to_2.4.80() { # Kafka configuration changes - # Global pipeline changes to REDIS or KAFKA + # Global pipeline changes to REDIS or KAFKA echo "Removing global.pipeline pillar configuration" sed -i '/pipeline:/d' /opt/so/saltstack/local/pillar/global/soc_global.sls # Kafka pillars @@ -615,11 +619,6 @@ up_to_2.4.70() { kafkapass=$(get_random_value) echo ' kafka_pass: '$kafkapass >> /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls - INSTALLEDVERSION=2.4.70 -} - -up_to_2.4.80() { - echo "Nothing to do for 2.4.80" INSTALLEDVERSION=2.4.80 }