From 2c8cbf0db1352675e07d60d4a3deda8abbda786e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Sep 2021 09:53:09 -0400 Subject: [PATCH 1/2] Soup Changes for True Clusters --- salt/common/tools/sbin/soup | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index ee744b7f2..817b0a4c1 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -634,6 +634,15 @@ up_2.3.5X_to_2.3.80() { sed -i '/ index_settings:/a \\ so-kibana: \n shards: 1 \n warm: 7 \n close: 30 \n delete: 365' /opt/so/saltstack/local/pillar/global.sls sed -i '/ index_settings:/a \\ so-redis: \n shards: 1 \n warm: 7 \n close: 30 \n delete: 365' /opt/so/saltstack/local/pillar/global.sls + # Do some pillar formatting + tc=$(grep -w true_cluster /opt/so/saltstack/local/pillar/global.sls | awk -F: {'print tolower($2)'}| xargs) + + if [[ "$tc" == "true" ]]; then + tcname=$(grep -w true_cluster_name /opt/so/saltstack/local/pillar/global.sls | awk -F: {'print $2'}) + sed -i '/elasticsearch:/a \\ config: \n cluster: \n name: $tcname' /opt/so/saltstack/local/pillar/global.sls + sed -i ' true_cluster_name/d /opt/so/saltstack/local/pillar/global.sls' + else + INSTALLEDVERSION=2.3.80 } From ed28e4d0000bc0593686fad1eee51f0da932e2d4 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Sep 2021 09:55:49 -0400 Subject: [PATCH 2/2] Soup Changes for True Clusters --- salt/common/tools/sbin/soup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 817b0a4c1..6460e04fa 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -640,8 +640,8 @@ up_2.3.5X_to_2.3.80() { if [[ "$tc" == "true" ]]; then tcname=$(grep -w true_cluster_name /opt/so/saltstack/local/pillar/global.sls | awk -F: {'print $2'}) sed -i '/elasticsearch:/a \\ config: \n cluster: \n name: $tcname' /opt/so/saltstack/local/pillar/global.sls - sed -i ' true_cluster_name/d /opt/so/saltstack/local/pillar/global.sls' - else + sed -i '/ true_cluster_name/d' /opt/so/saltstack/local/pillar/global.sls + fi INSTALLEDVERSION=2.3.80 }