From 028297cef8ecda720def39fa762e697fce2b20ee Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Thu, 20 Mar 2025 13:46:30 -0400 Subject: [PATCH] add bootstrap-salt to preloaded soup_scripts --- salt/common/soup_scripts.sls | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index 60215f949..24e6c6152 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -64,6 +64,12 @@ copy_so-repo-sync_manager_tools_sbin: - source: {{UPDATE_DIR}}/salt/manager/tools/sbin/so-repo-sync - preserve: True +copy_bootstrap-salt_manager_tools_sbin: + file.copy: + - name: /opt/so/saltstack/default/salt/salt/scripts/bootstrap-salt.sh + - source: {{UPDATE_DIR}}/salt/salt/scripts/bootstrap-salt.sh + - preserve: True + # This section is used to put the new script in place so that it can be called during soup. # It is faster than calling the states that normally manage them to put them in place. copy_so-common_sbin: @@ -108,6 +114,13 @@ copy_so-repo-sync_sbin: - force: True - preserve: True +copy_bootstrap-salt_sbin: + file.copy: + - name: /usr/sbin/bootstrap-salt.sh + - source: {{UPDATE_DIR}}/salt/salt/scripts/bootstrap-salt.sh + - force: True + - preserve: True + {# this is added in 2.4.120 to remove salt repo files pointing to saltproject.io to accomodate the move to broadcom and new bootstrap-salt script #} {% if salt['pkg.version_cmp'](SOVERSION, '2.4.120') == -1 %} {% set saltrepofile = '/etc/yum.repos.d/salt.repo' %}