From ca4f2f1dd66a89ef9fea27b8f20cf5b22afe0112 Mon Sep 17 00:00:00 2001 From: reyesj2 <94730068+reyesj2@users.noreply.github.com> Date: Fri, 19 Jan 2024 08:31:20 -0500 Subject: [PATCH] Add creation of additional pillars to soup for stig state Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com> --- salt/manager/tools/sbin/soup | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index f9ce6d041..e278a5056 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -405,6 +405,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.4.10 ]] && up_to_2.4.20 [[ "$INSTALLEDVERSION" == 2.4.20 ]] && up_to_2.4.30 [[ "$INSTALLEDVERSION" == 2.4.30 ]] && up_to_2.4.40 + [[ "$INSTALLEDVERSION" == 2.4.40 ]] && up_to_2.4.50 true } @@ -419,6 +420,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.4.10 ]] && post_to_2.4.20 [[ "$POSTVERSION" == 2.4.20 ]] && post_to_2.4.30 [[ "$POSTVERSION" == 2.4.30 ]] && post_to_2.4.40 + [[ "$POSTVERSION" == 2.4.40 ]] && post_to_2.4.50 true } @@ -470,6 +472,11 @@ post_to_2.4.40() { POSTVERSION=2.4.40 } +post_to_2.4.50() { + echo "Nothing to apply" + POSTVERSION=2.4.50 +} + repo_sync() { echo "Sync the local repo." su socore -c '/usr/sbin/so-repo-sync' || fail "Unable to complete so-repo-sync." @@ -570,6 +577,14 @@ up_to_2.4.40() { INSTALLEDVERSION=2.4.40 } +up_to_2.4.50() { + echo "Creating additional pillars.." + touch /opt/so/saltstack/local/pillar/stig/adv_stig.sls + touch /opt/so/saltstack/local/pillar/stig/soc_stig.sls + + INSTALLEDVERSION=2.4.50 +} + determine_elastic_agent_upgrade() { if [[ $is_airgap -eq 0 ]]; then update_elastic_agent_airgap