upgrade salt 3006.19

salt/manager/tools/sbin/soup

@@ -996,7 +996,7 @@ up_to_2.4.210() {
   determine_elastic_agent_upgrade
   create_ca_pillar
   # This is the only way the state is called so we can use concurrent=True
-  salt-call state.apply salt.master.add_minimum_auth_version_engine --file-root=$UPDATE_DIR/salt --local concurrent=True
+  salt-call state.apply salt.master.add_minimum_auth_version --file-root=$UPDATE_DIR/salt --local concurrent=True
   INSTALLEDVERSION=2.4.210
 }
 

salt/salt/engines/master/minimum_auth_version.py

@@ -62,7 +62,7 @@ def start(wait_days=7):
             if elapsed >= wait_delta:
                 log.info("Changing minimum_auth_version")
                 _clear_start_time()
-                result = caller.cmd('state.apply', 'salt.master.remove_minimum_auth_version_engine', kwarg={'queue': True})
+                result = caller.cmd('state.apply', 'salt.master.remove_minimum_auth_version', kwarg={'queue': True})
                 # We shouldn't reach this line since the above line should remove the engine and restart salt-master
                 log.info("State apply result: %s", result)
                 mav_removed = True

salt/salt/master/add_minimum_auth_version_engine.sls

@@ -5,6 +5,11 @@
 
 # This state is to be used during soup preupgrade_changes, and run when the salt-master has been stopped. Soup will later start the salt-master.
 
+set_minimum_auth_version_0:
+  file.managed:
+    - name: /etc/salt/master.d/minimum_auth_version.conf
+    - source: salt://salt/master/files/minimum_auth_version.conf
+
 add_minimum_auth_version_engine_config:
   file.managed:
     - name: /etc/salt/master.d/minimum_auth_version_engine.conf

salt/salt/master/remove_minimum_auth_version_engine.sls

@@ -6,6 +6,10 @@
 include:
   - salt.master
 
+unset_minimum_auth_version_0:
+  file.absent:
+    - name: /etc/salt/master.d/minimum_auth_version.conf
+
 remove_minimum_auth_version_engine_config:
   file.absent:
     - name: /etc/salt/master.d/minimum_auth_version_engine.conf