Commit 67e30353 authored by godog's avatar godog

Merge branch 'buster-fixes' into 'master'

Buster fixes

See merge request !96
parents f2b67fab 9fc9fc02
Pipeline #6084 passed with stages
in 10 minutes and 13 seconds
......@@ -46,7 +46,7 @@
- name: Run apt-get update
apt:
update_cache: yes
cache_valid_time: 1800
cache_valid_time: '{{ 1800 if ansible_distribution_release == float_debian_dist else 1 }}'
# When testing, try to make dpkg faster by disabling fsync.
- name: Speed up dpkg
......
......@@ -14,6 +14,5 @@
# Also clear failed status if any for disabled units
- name: Reset failed unwanted systemd units
command: "systemctl reset-failed {{ item }}"
command: "systemctl reset-failed {{ float_disabled_systemd_units | join(' ') }}"
ignore_errors: true
with_items: "{{ float_disabled_systemd_units }}"
......@@ -4,11 +4,6 @@
url: https://download.docker.com/linux/debian/gpg
state: absent
- name: Remove docker.com package repository
apt_repository:
repo: "deb [arch=amd64] {% if apt_proxy is defined %}http://{{ apt_proxy }}/HTTPS/{% else %}https:{% endif %}//download.docker.com/linux/debian {{ ansible_distribution_release }} stable"
state: absent
- name: Remove docker packages
apt:
name: "{{ packages }}"
......@@ -23,6 +18,7 @@
dest: "{{ item }}"
state: absent
with_items:
- /etc/apt/sources.list.d/download_docker_com_linux_debian.list
- /etc/docker
- /usr/local/bin/docker-cleanup
- /etc/cron.d/docker-cleanup
......@@ -70,6 +70,7 @@
when: "container_runtime == 'podman'"
loop: "{{ float_enabled_containers }}"
changed_when: "podman_image.rc == 0"
failed_when: "podman_image.rc not in [0, 42]"
- name: Start the systemd units
systemd:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment