From 2720dc186a1e488833533bfa8e14bfaa578aabca Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 7 Jul 2022 10:31:16 +0000 Subject: feat(ansible): Migrate Ubuntu Jammy II Signed-off-by: Peter Mikus Change-Id: I43c86ab3232a382e7cc9010fb04a0ca269b24e77 --- fdio.infra.ansible/roles/docker/defaults/main.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'fdio.infra.ansible/roles/docker/defaults') diff --git a/fdio.infra.ansible/roles/docker/defaults/main.yaml b/fdio.infra.ansible/roles/docker/defaults/main.yaml index a8f4e6289d..e493d1c9b5 100644 --- a/fdio.infra.ansible/roles/docker/defaults/main.yaml +++ b/fdio.infra.ansible/roles/docker/defaults/main.yaml @@ -10,10 +10,11 @@ docker_package_state: latest docker_service_state: started docker_service_enabled: true docker_restart_handler_state: restarted +docker_service_mgr: "" # Used only for Debian/Ubuntu. docker_apt_release_channel: "stable" -docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable" docker_apt_repository_state: present docker_apt_ignore_key_error: true docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" @@ -25,10 +26,6 @@ docker_yum_repo_enable_edge: "0" docker_yum_repo_enable_test: "0" docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg -# A list of users who will be added to the docker group. -docker_users: - - "{{ ansible_user }}" - # Proxy settings. docker_daemon_environment_http: - "HTTP_PROXY={{ proxy_env.http_proxy }}" -- cgit 1.2.3-korg