Skip to content

Commit

Permalink
build,script: Pin salt version in bootstrap and restore
Browse files Browse the repository at this point in the history
In bootstrap and restore we install salt-minion on the node so we need
to pin the salt version we want to install and not just install the one
yum will find depending on various things (like available versions,
priority on repos, ...)

Fixes: #2704
  • Loading branch information
TeddyAndrieux committed Aug 11, 2020
1 parent 1e91ac1 commit 1afee70
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
10 changes: 8 additions & 2 deletions buildchain/buildchain/iso.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
),
Expand All @@ -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'],
),
Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/restore.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down

0 comments on commit 1afee70

Please sign in to comment.