Merge branch 'bugfix/refresh-pillar-before-salt-master-upgrade' into …

…q/125.0
scality · Sep 19, 2023 · a5688a7 · a5688a7
2 parents c970d16 + b1b7052
commit a5688a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@
 - Make salt master `worker_threads` and `timeout` configurable
   (PR[4149](https://github.com/scality/metalk8s/pull/4149))
 
+### Bug fixes
+
+- Fix a bug that make the upgrade fail if there is some changes
+  on the salt master based on the salt pillar
+  (PR[4156](https://github.com/scality/metalk8s/pull/4156))
+
 ## Release 125.0.5
 
 ### Additions

diff --git a/scripts/upgrade.sh.in b/scripts/upgrade.sh.in
@@ -84,9 +84,9 @@ upgrade_bootstrap () {
         metalk8s.orchestrate.bootstrap.pre-upgrade \
         saltenv="$SALTENV"
 
-    # Upgrade salt-master in local mode since salt-master will
-    # restart
-    "${SALT_CALL}" --local --retcode-passthrough state.sls sync_mods="all" \
+    # Upgrade salt-master in local mode since salt-master will restart
+    "$SALT_CALL" --local saltutil.sync_all saltenv="$SALTENV" refresh=True
+    "$SALT_CALL" --local --retcode-passthrough state.sls \
         metalk8s.salt.master.installed saltenv="$SALTENV"
 }