From 08f208cd38cb3e30be8920503623e812c626df9f Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Thu, 22 May 2025 15:37:34 -0400
Subject: [PATCH] ensure bootstrap-salt is updated for salt-cloud installs

---
 salt/salt/init.sls   | 1 +
 salt/salt/master.sls | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index b2ea31a65..724f79a95 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -5,6 +5,7 @@ saltpymodules:
       - python3-docker
 {% endif %}
 
+# distribute to minions for salt upgrades
 salt_bootstrap:
   file.managed:
     - name: /usr/sbin/bootstrap-salt.sh
diff --git a/salt/salt/master.sls b/salt/salt/master.sls
index 413c90cd5..fce702932 100644
--- a/salt/salt/master.sls
+++ b/salt/salt/master.sls
@@ -76,6 +76,13 @@ engines_config:
     - name: /etc/salt/master.d/engines.conf
     - source: salt://salt/files/engines.conf
 
+# update the bootstrap script when used for salt-cloud
+salt_bootstrap_cloud:
+  file.managed:
+    - name: /opt/saltstack/salt/lib/python3.10/site-packages/salt/cloud/deploy/bootstrap-salt.sh
+    - source: salt://salt/scripts/bootstrap-salt.sh
+    - show_changes: False
+
 salt_master_service:
   service.running:
     - name: salt-master