From 6b60e85a337f11ac8559740ff90bae3a43d0507a Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Wed, 1 May 2024 10:15:26 -0400
Subject: [PATCH] Make kafka configuration changes prior to 2.4.70 upgrade

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
---
 salt/manager/tools/sbin/soup | 41 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 16f4d9076..6e4820717 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -438,26 +438,7 @@ post_to_2.4.60() {
 }
 
 post_to_2.4.70() {
-  # 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 configuration
-  mkdir -p /opt/so/saltstack/local/pillar/kafka
-  touch /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
-  touch /opt/so/saltstack/local/pillar/kafka/adv_kafka.sls
-  echo 'kafka: ' > /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
-
-  if ! grep -q "^    cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
-    kafka_cluster_id=$(get_random_value 22)
-    echo '    cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-  fi
-
-  if ! grep -q "^    kafka_pass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
-    kafkapass=$(get_random_value)
-    echo '    kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-  fi
-
+  echo "Nothing to apply"
   POSTVERSION=2.4.70
 }
 
@@ -603,6 +584,26 @@ up_to_2.4.60() {
 up_to_2.4.70() {
   playbook_migration
   toggle_telemetry
+
+  # Kafka configuration changes
+
+    # 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
+  mkdir -p /opt/so/saltstack/local/pillar/kafka
+  touch /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
+  touch /opt/so/saltstack/local/pillar/kafka/adv_kafka.sls
+  echo 'kafka: ' > /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
+  if ! grep -q "^    cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
+    kafka_cluster_id=$(get_random_value 22)
+    echo '    cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+  fi
+  if ! grep -q "^    kafka_pass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
+    kafkapass=$(get_random_value)
+    echo '    kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+  fi
+
   INSTALLEDVERSION=2.4.70
 }