Infra: Ansible maintenance

[csit.git] / resources / tools / testbed-setup / ansible / roles / docker / defaults / main.yaml

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 4f2cae9..6c445aa 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml
@@ -2,29 +2,30 @@
 # file: roles/docker/defaults/main.yaml
 
 # Version options.
-docker_edition: 'ce'
-docker_version: '19.03.3'
-docker_apt_package: '5:{{ docker_version }}~3-0~{{ ansible_distribution | lower }}-{{ ansible_distribution_release }}'
-docker_apt_package_state: present
+docker_edition: "ce"
+docker_package: "docker-{{ docker_edition }}"
+docker_package_state: present
 
 # Service options.
 docker_service_state: started
 docker_service_enabled: true
 docker_restart_handler_state: restarted
 
-# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
-docker_apt_release_channel: 'edge'
-docker_apt_repository: 'deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}'
+# 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
 
 # A list of users who will be added to the docker group.
 docker_users:
-  - 'testuser'
+  - "testuser"
 
 # Proxy settings.
 docker_daemon_environment_http:
-  - 'HTTP_PROXY={{ proxy_env.http_proxy }}'
-  - 'NO_PROXY={{ proxy_env.no_proxy }}'
+  - "HTTP_PROXY={{ proxy_env.http_proxy }}"
+  - "NO_PROXY={{ proxy_env.no_proxy }}"
 docker_daemon_environment_https:
-  - 'HTTPS_PROXY={{ proxy_env.https_proxy }}'
-  - 'NO_PROXY={{ proxy_env.no_proxy }}'
+  - "HTTPS_PROXY={{ proxy_env.https_proxy }}"
+  - "NO_PROXY={{ proxy_env.no_proxy }}"