From ed014b431e20374c3ec2595f96f15b93f4a0ac5e Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Sun, 15 Feb 2026 09:16:36 -0500 Subject: [PATCH] upgrade salt 3006.19 --- salt/salt/engines/master/minimum_auth_version.py | 7 +++---- ..._version_engine.sls => remove_minimum_auth_version.sls} | 0 2 files changed, 3 insertions(+), 4 deletions(-) rename salt/salt/master/{remove_minimum_auth_version_engine.sls => remove_minimum_auth_version.sls} (100%) diff --git a/salt/salt/engines/master/minimum_auth_version.py b/salt/salt/engines/master/minimum_auth_version.py index 59be18f28..1213cb5e1 100644 --- a/salt/salt/engines/master/minimum_auth_version.py +++ b/salt/salt/engines/master/minimum_auth_version.py @@ -62,13 +62,12 @@ 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', kwarg={'queue': True}) + result = caller.cmd('state.apply', 'salt.master.remove_minimum_auth_version', 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 else: - remaining = wait_delta - elapsed - days_remaining = remaining.total_seconds() / 86400 - log.info("Time remaining before changing minimum_auth_version: %.1f days", days_remaining) + target_time = start_time + wait_delta + log.info("minimum_auth_version will be changed within an hour of %s", target_time.strftime('%m-%d-%Y %H:%M')) time.sleep(3600) # Check hourly diff --git a/salt/salt/master/remove_minimum_auth_version_engine.sls b/salt/salt/master/remove_minimum_auth_version.sls similarity index 100% rename from salt/salt/master/remove_minimum_auth_version_engine.sls rename to salt/salt/master/remove_minimum_auth_version.sls