diff --git a/salt/docker/init.sls b/salt/docker/init.sls index f2a4c80a9..36530c9c3 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -26,10 +26,10 @@ dockerheldpackages: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io: 1.6.18-3.1.el9 - - docker-ce: 23.0.1-1.el9 - - docker-ce-cli: 23.0.1-1.el9 - - docker-ce-rootless-extras: 23.0.1-1.el9 + - containerd.io: 1.6.20-3.1.el9 + - docker-ce: 23.0.5-1.el9 + - docker-ce-cli: 23.0.5-1.el9 + - docker-ce-rootless-extras: 23.0.5-1.el9 - hold: True - update_holds: True {% endif %} diff --git a/setup/so-functions b/setup/so-functions index 1cd81e644..cf6bb83ab 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1675,51 +1675,6 @@ parse_install_username() { INSTALLUSERNAME=${SUDO_USER:-${USER}} } -patch_pillar() { - title "Create the patch pillar file" - local pillar_file=$local_salt_dir/pillar/minions/$MINION_ID.sls - - - if [[ $MANAGERUPDATES == 1 ]]; then - local source="manager" - else - local source="direct" - fi - - printf '%s\n'\ - "patch:"\ - " os:"\ - " source: '$source'"\ - " schedule_name: '$PATCHSCHEDULENAME'"\ - " enabled: True"\ - " splay: 300"\ - "" > "$pillar_file" - -} - -patch_schedule_os_new() { - title "Create the patch schedule" - local OSPATCHSCHEDULEDIR="$temp_install_dir/salt/patch/os/schedules" - local OSPATCHSCHEDULE="$OSPATCHSCHEDULEDIR/$PATCHSCHEDULENAME.yml" - - logCmd "mkdir -p $OSPATCHSCHEDULEDIR" - - printf '%s\n'\ - "patch:"\ - " os:"\ - " schedule:"> "$OSPATCHSCHEDULE" - for psd in "${PATCHSCHEDULEDAYS[@]}";do - psd="${psd//\"/}" - echo " - $psd:" >> "$OSPATCHSCHEDULE" - for psh in "${PATCHSCHEDULEHOURS[@]}" - do - psh="${psh//\"/}" - echo " - '$psh'" >> "$OSPATCHSCHEDULE" - done - done - -} - print_salt_state_apply() { local state=$1