Skip to content

Commit 2dcf1a9

Browse files
committed
Use Docker 29 on 2024.1 Caracal
Docker can be updated to version 29 using a package update. We risk downgrading to 28 when running `kayobe overcloud host configure`, which might be worse than the upgrade from 28 to 29. Revert "limit docker-ce to 28 on Caracal" This reverts commit 18027ca. Revert "Fix Docker version check" This reverts commit 01de41a.
1 parent ac8acbe commit 2dcf1a9

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

etc/kayobe/ansible/stackhpc-cloud-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
# Inclusive min
143143
sct_docker_version_min: "24.0.0"
144144
# Exclusive max
145-
sct_docker_version_max: "29.0.0"
145+
sct_docker_version_max: "30.0.0"
146146
sct_selinux_state: "{{ selinux_state }}"
147147
failed_when: host_results.rc not in [0, 1]
148148
register: host_results

etc/kayobe/docker.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@ docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
3838
# Enable live-restore on docker daemon
3939
docker_daemon_live_restore: true
4040

41-
# Avoid docker 29 for the moment in Caracal
42-
docker_packages_version: "{{ '-28.*' if os_distribution == 'rocky' else ('=5:28*' if os_release == 'noble' else '=5:27*') }}"
43-
# variable from https://github.com/stackhpc/ansible-role-docker/blob/master/defaults/main.yml
44-
docker_packages:
45-
- "docker-ce{{ docker_packages_version }}"
46-
- "docker-ce-cli{{ docker_packages_version }}"
47-
- "docker-ce-rootless-extras{{ docker_packages_version }}"
48-
- "containerd.io"
49-
5041
###############################################################################
5142
# Dummy variable to allow Ansible to accept this file.
5243
workaround_ansible_issue_8743: yes

0 commit comments

Comments
 (0)