aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra.ansible/roles/docker
diff options
context:
space:
mode:
Diffstat (limited to 'fdio.infra.ansible/roles/docker')
-rw-r--r--fdio.infra.ansible/roles/docker/defaults/main.yaml2
-rw-r--r--fdio.infra.ansible/roles/docker/meta/main.yaml1
-rw-r--r--fdio.infra.ansible/roles/docker/tasks/focal.yaml30
3 files changed, 1 insertions, 32 deletions
diff --git a/fdio.infra.ansible/roles/docker/defaults/main.yaml b/fdio.infra.ansible/roles/docker/defaults/main.yaml
index e493d1c9b5..bf97b4a192 100644
--- a/fdio.infra.ansible/roles/docker/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/docker/defaults/main.yaml
@@ -10,7 +10,7 @@ docker_package_state: latest
docker_service_state: started
docker_service_enabled: true
docker_restart_handler_state: restarted
-docker_service_mgr: ""
+docker_service_mgr: "systemd"
# Used only for Debian/Ubuntu.
docker_apt_release_channel: "stable"
diff --git a/fdio.infra.ansible/roles/docker/meta/main.yaml b/fdio.infra.ansible/roles/docker/meta/main.yaml
index ac6c0a9980..7bef656eb5 100644
--- a/fdio.infra.ansible/roles/docker/meta/main.yaml
+++ b/fdio.infra.ansible/roles/docker/meta/main.yaml
@@ -13,7 +13,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- - focal
- jammy
galaxy_tags:
- docker
diff --git a/fdio.infra.ansible/roles/docker/tasks/focal.yaml b/fdio.infra.ansible/roles/docker/tasks/focal.yaml
deleted file mode 100644
index 27fee6285c..0000000000
--- a/fdio.infra.ansible/roles/docker/tasks/focal.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# file: roles/docker/tasks/ubuntu_focal.yaml
-
-- name: Inst - Dependencies
- ansible.builtin.apt:
- name:
- - "apt-transport-https"
- - "ca-certificates"
- - "gpg-agent"
- - "software-properties-common"
- state: "present"
- cache_valid_time: 3600
- install_recommends: false
- tags:
- - docker-inst-dependencies
-
-- name: Conf - Add APT Key
- ansible.builtin.apt_key:
- url: "{{ docker_apt_gpg_key }}"
- state: "{{ docker_apt_gpg_key_state }}"
- tags:
- - docker-conf-apt
-
-- name: Conf - Install APT Repository
- ansible.builtin.apt_repository:
- repo: "{{ docker_apt_repository }}"
- state: "{{ docker_apt_repository_state }}"
- update_cache: true
- tags:
- - docker-conf-apt