switching from docker.io to docker-ce

cloudmon/ansible/project/roles/apimon_executor/tasks/main.yml

@@ -1,26 +1,95 @@
 ---
-# tasks file for executor
-
 - name: Include variables
-  include_vars: "{{ lookup('first_found', params) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
     params:
       files: "{{ distro_lookup_path }}"
       paths:
         - "vars"
 
+- name: Update apt cache on Ubuntu
+  ansible.builtin.apt:
+    update_cache: true
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.pkg_mgr != 'atomic_container'
+
+- name: Remove conflicting Ubuntu Docker packages
+  ansible.builtin.package:
+    state: absent
+    name: "{{ remove_packages }}"
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - remove_packages is defined
+    - ansible_facts.pkg_mgr != 'atomic_container'
+  register: remove_result
+  until: remove_result is success
+  retries: 5
+
 - name: Install required packages
-  become: true
   ansible.builtin.package:
     state: present
-    name: "{{ item }}"
-  loop: 
-    - "{{ packages }}"
+    name: "{{ packages }}"
   when: "ansible_facts.pkg_mgr != 'atomic_container'"
-  register: task_result
-  until: task_result is success
+  register: install_result
+  until: install_result is success
   retries: 5
 
+- name: Clean up stale sockets after package changes
+  block:
+    - name: Stop Docker service and socket
+      ansible.builtin.systemd:
+        name: "{{ item }}"
+        state: stopped
+      loop:
+        - docker.service
+        - docker.socket
+      failed_when: false
+
+    - name: Remove stale Docker socket and PID files
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: absent
+      loop:
+        - /var/run/docker.sock
+        - /var/run/docker.pid
+  when:
+    - remove_result is changed or install_result is changed
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
+- name: Clear systemd rate-limits and prepare containerd
+  block:
+    - name: Reset systemd failed state for Docker units
+      ansible.builtin.systemd:
+        name: "{{ item }}"
+        reset_failed: true
+      loop:
+        - docker.socket
+        - docker.service
+      failed_when: false
+
+    - name: Ensure containerd service is started and enabled
+      ansible.builtin.systemd:
+        name: containerd
+        state: started
+        enabled: true
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
+- name: Start and enable Docker socket and daemon
+  ansible.builtin.systemd:
+    name: "{{ item }}"
+    state: started
+    enabled: true
+  loop:
+    - docker.socket
+    - docker.service
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
 - name: Create executor group
   become: yes
   ansible.builtin.group:
@@ -33,7 +102,7 @@
     name: "{{ executor_os_user }}"
     group: "{{ executor_os_group }}"
     groups: "{{ (container_command == 'docker') | ternary('docker', '', omit) }}"
-    state: "present"
+    state: present
 
 - name: Write Executor SystemD unit file
   become: true
@@ -47,7 +116,7 @@
   become: true
   ansible.builtin.file:
     dest: "{{ item.dest }}"
-    state: "directory"
+    state: directory
     owner: "{{ executor_os_user }}"
     group: "{{ executor_os_group }}"
     mode: "{{ item.mode | default(omit) }}"

cloudmon/ansible/project/roles/apimon_executor/vars/Debian.yaml

@@ -1,5 +1,6 @@
 ---
-ansible_python_interpreter: "/usr/bin/python3"
+remove_packages: []
+
 packages:
   - docker.io
 container_command: docker

cloudmon/ansible/project/roles/apimon_executor/vars/Ubuntu.yaml

@@ -0,0 +1,17 @@
+---
+remove_packages:
+  - docker.io
+  - docker-doc
+  - docker-compose
+  - podman-docker
+  - containerd
+  - runc
+
+packages:
+  - docker-ce
+  - docker-ce-cli
+  - containerd.io
+  - docker-buildx-plugin
+  - docker-compose-plugin
+
+container_command: docker

cloudmon/ansible/project/roles/apimon_scheduler/tasks/main.yml

@@ -2,26 +2,98 @@
 # tasks file for scheduler
 
 - name: Include variables
-  include_vars: "{{ lookup('first_found', params) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
     params:
       files: "{{ distro_lookup_path }}"
       paths:
         - "vars"
 
+- name: Update apt cache on Ubuntu
+  ansible.builtin.apt:
+    update_cache: true
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.pkg_mgr != 'atomic_container'
+
+- name: Remove conflicting Ubuntu Docker packages
+  ansible.builtin.package:
+    state: absent
+    name: "{{ remove_packages }}"
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - remove_packages is defined
+    - ansible_facts.pkg_mgr != 'atomic_container'
+  register: remove_result
+  until: remove_result is success
+  retries: 5
+
 - name: Install required packages
-  become: true
   ansible.builtin.package:
     state: present
-    name: "{{ item }}"
-  loop: 
-    - "{{ packages }}"
+    name: "{{ packages }}"
   when: "ansible_facts.pkg_mgr != 'atomic_container'"
-  register: task_result
-  until: task_result is success
+  register: install_result
+  until: install_result is success
   retries: 5
 
+- name: Clean up stale sockets after package changes
+  block:
+    - name: Stop Docker service and socket
+      ansible.builtin.systemd:
+        name: "{{ item }}"
+        state: stopped
+      loop:
+        - docker.service
+        - docker.socket
+      failed_when: false
+
+    - name: Remove stale Docker socket and PID files
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: absent
+      loop:
+        - /var/run/docker.sock
+        - /var/run/docker.pid
+  when:
+    - remove_result is changed or install_result is changed
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
+- name: Clear systemd rate-limits and prepare containerd
+  block:
+    - name: Reset systemd failed state for Docker units
+      ansible.builtin.systemd:
+        name: "{{ item }}"
+        reset_failed: true
+      loop:
+        - docker.socket
+        - docker.service
+      failed_when: false
+
+    - name: Ensure containerd service is started and enabled
+      ansible.builtin.systemd:
+        name: containerd
+        state: started
+        enabled: true
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
+- name: Start and enable Docker socket and daemon
+  ansible.builtin.systemd:
+    name: "{{ item }}"
+    state: started
+    enabled: true
+  loop:
+    - docker.socket
+    - docker.service
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
 - include_tasks: firewall.yml
+  when: cloudmon_manage_firewall | default(true) | bool
 
 - name: Create scheduler group
   become: yes
@@ -35,7 +107,7 @@
     name: "{{ scheduler_os_user }}"
     group: "{{ scheduler_os_group }}"
     groups: "{{ (container_command == 'docker') | ternary('docker', '', omit) }}"
-    state: "present"
+    state: present
 
 - name: Write Scheduler SystemD unit file
   become: true
@@ -49,7 +121,7 @@
   become: true
   ansible.builtin.file:
     dest: "{{ item.dest }}"
-    state: "directory"
+    state: directory
     owner: "{{ scheduler_os_user }}"
     group: "{{ scheduler_os_group }}"
     mode: "{{ item.mode | default(omit) }}"

cloudmon/ansible/project/roles/apimon_scheduler/vars/Debian.yaml

@@ -1,6 +1,8 @@
 ---
-ansible_python_interpreter: "/usr/bin/python3"
+remove_packages: []
+
 packages:
   - docker.io
   - firewalld
+  - python3-firewall
 container_command: docker

cloudmon/ansible/project/roles/apimon_scheduler/vars/Ubuntu.yaml

@@ -0,0 +1,17 @@
+---
+remove_packages:
+  - docker.io
+  - docker-doc
+  - docker-compose
+  - podman-docker
+  - containerd
+  - runc
+
+packages:
+  - docker-ce
+  - docker-ce-cli
+  - containerd.io
+  - docker-buildx-plugin
+  - docker-compose-plugin
+
+container_command: docker

cloudmon/ansible/project/roles/base/repos/files/sources.list.jammy.x86_64

@@ -0,0 +1,5 @@
+deb http://de.archive.ubuntu.com/ubuntu jammy main universe
+deb http://de.archive.ubuntu.com/ubuntu jammy-updates main universe
+deb http://de.archive.ubuntu.com/ubuntu jammy-backports main universe
+deb http://de.archive.ubuntu.com/ubuntu jammy-security main universe
+deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu   jammy stable

cloudmon/ansible/project/roles/base/repos/files/sources.list.noble.x86_64

@@ -0,0 +1,5 @@
+deb http://de.archive.ubuntu.com/ubuntu noble main universe
+deb http://de.archive.ubuntu.com/ubuntu noble-updates main universe
+deb http://de.archive.ubuntu.com/ubuntu noble-backports main universe
+deb http://de.archive.ubuntu.com/ubuntu noble-security main universe
+deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu   noble stable

cloudmon/ansible/project/roles/base/repos/tasks/Debian.yaml

@@ -0,0 +1,19 @@
+- name: Ensure /etc/apt/keyrings directory exists
+  ansible.builtin.file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: '0755'
+
+- name: Download Docker official GPG key
+  ansible.builtin.get_url:
+    url: https://download.docker.com/linux/ubuntu/gpg
+    dest: /etc/apt/keyrings/docker.asc
+    mode: '0644'
+  failed_when: false
+  when:
+    - ansible_facts.distribution == 'Ubuntu'
+    - ansible_facts.distribution_major_version == '22'
+
+- name: Configure apt retries
+  copy:
+    mode: 0444