Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/soupagrepo #11670

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Fix/soupagrepo #11670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
338146f
fix repo update during soup for airgap
m0duspwnens Nov 1, 2023
4d7b109
Merge remote-tracking branch 'origin/2.4/dev' into fix/soupagrepo
m0duspwnens Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions salt/manager/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ update_airgap_rules() {
rsync -av $UPDATE_DIR/agrules/* /nsm/repo/rules/
}

update_centos_repo() {
update_airgap_repo() {
# Update the files in the repo
echo "Syncing new updates to /nsm/repo"
rsync -av $AGREPO/* /nsm/repo/
Expand Down Expand Up @@ -821,6 +821,7 @@ main() {
set -e

if [[ $is_airgap -eq 0 ]]; then
update_airgap_repo
yum clean all
check_os_updates
elif [[ $OS == 'oracle' ]]; then
Expand Down Expand Up @@ -895,11 +896,6 @@ main() {
update_airgap_rules
fi

# Only update the repo if its airgap
if [[ $is_airgap -eq 0 && $UPGRADESALT -ne 1 ]]; then
update_centos_repo
fi

# since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
if [[ ! "$MINIONID" =~ "_import" ]]; then
echo ""
Expand Down