From 816bfdf912b9530e5038cdd5cbc51f23286c3fe9 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 18 Nov 2020 13:16:05 +0000 Subject: Ansible: Docker update Signed-off-by: pmikus Change-Id: Ie48a96d83d37d7292d261875371e09d4b9152c7b --- .../testbed-setup/ansible/roles/docker/defaults/main.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/roles/docker/defaults') diff --git a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml index 6c445aa42a..9b182de4c4 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml @@ -4,7 +4,7 @@ # Version options. docker_edition: "ce" docker_package: "docker-{{ docker_edition }}" -docker_package_state: present +docker_package_state: latest # Service options. docker_service_state: started @@ -13,10 +13,17 @@ docker_restart_handler_state: restarted # Used only for Debian/Ubuntu. docker_apt_release_channel: "stable" -docker_apt_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" -docker_apt_key_state: present docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_repository_state: present +docker_apt_ignore_key_error: true +docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" +docker_apt_gpg_key_state: present + +# Used only for RedHat/CentOS/Fedora. +docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo +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: @@ -28,4 +35,4 @@ docker_daemon_environment_http: - "NO_PROXY={{ proxy_env.no_proxy }}" docker_daemon_environment_https: - "HTTPS_PROXY={{ proxy_env.https_proxy }}" - - "NO_PROXY={{ proxy_env.no_proxy }}" + - "NO_PROXY={{ proxy_env.no_proxy }}" \ No newline at end of file -- cgit 1.2.3-korg