Merge branch 'bugfix/GH-2704-pin-salt-version-in-bootstrap' into tmp/…

…octopus/w/2.5/bugfix/GH-2704-pin-salt-version-in-bootstrap
scality · Aug 11, 2020 · e1ecc42 · e1ecc42
2 parents 49d880c + e869013
commit e1ecc42
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/buildchain/buildchain/iso.py b/buildchain/buildchain/iso.py
@@ -85,7 +85,10 @@
                 task_name='bootstrap.sh',
                 source=constants.ROOT/'scripts'/'bootstrap.sh.in',
                 destination=constants.ISO_ROOT/'bootstrap.sh',
-                context={'VERSION': versions.VERSION},
+                context={
+                    'VERSION': versions.VERSION,
+                    'SALT_VERSION': versions.SALT_VERSION
+                },
                 file_dep=[versions.VERSION_FILE],
                 task_dep=['_iso_mkdir_root'],
             ),
@@ -101,7 +104,10 @@
                 task_name='restore.sh',
                 source=constants.ROOT/'scripts'/'restore.sh.in',
                 destination=constants.ISO_ROOT/'restore.sh',
-                context={'VERSION': versions.VERSION},
+                context={
+                    'VERSION': versions.VERSION,
+                    'SALT_VERSION': versions.SALT_VERSION
+                },
                 file_dep=[versions.VERSION_FILE],
                 task_dep=['_iso_mkdir_root'],
             ),

diff --git a/salt/metalk8s/repo/redhat.sls b/salt/metalk8s/repo/redhat.sls
@@ -65,6 +65,9 @@ Configure {{ repo_name }} repository:
   {%- endif %}
     - repo_gpg_check: {{ repo_config.repo_gpg_check }}
     - enabled: {{ repo_config.enabled }}
+    # Set priority to 1, even if the `yum-plugin-priorities` is not installed,
+    # so that our repos has priority over others
+    - priority: 1
     # URL to the proxy server for this repository.
     # Set to '_none_' to disable the global proxy setting
     # for this repository.

diff --git a/scripts/bootstrap.sh.in b/scripts/bootstrap.sh.in
@@ -56,7 +56,7 @@ BASE_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SALT_CALL=${SALT_CALL:-salt-call}
 
 declare -a PACKAGES=(
-    salt-minion
+    salt-minion-@@SALT_VERSION
     genisoimage
 )
 

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -95,6 +95,7 @@ configure_yum_local_repository() {
 name=$repo_name
 baseurl=file://$repo_path
 enabled=1
+priority=1
 gpgcheck=$gpgcheck
 ${gpg_keys:+gpgkey=${gpg_keys%?}}
 EOF

diff --git a/scripts/restore.sh.in b/scripts/restore.sh.in
@@ -70,7 +70,7 @@ BASE_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SALT_CALL=${SALT_CALL:-salt-call}
 
 declare -a PACKAGES=(
-    salt-minion
+    salt-minion-@@SALT_VERSION
     genisoimage
 )