diff options
| author |   pmikus <pmikus@cisco.com> | 2020-05-20 15:05:49 +0000 |
|---|---|---|
| committer | pmikus <pmikus@cisco.com> | 2020-05-20 15:05:49 +0000 |
| commit | 5c7b32f5ba60acae88af6e838c79639d68a4fcad (patch) | |
| tree | 601fe25983529d20abf31b43f9b21ab8bdf35e12 /resources/tools/testbed-setup/ansible/roles/docker/defaults | |
| parent | 1881e1a4a59c3bd4a8574a1a0239a781874a48ec (diff) | |
Infra: Ansible maintenance
+ As per last discoveries when running from_scratch vs. append_only
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I8b44314185bbc157a67136730dc6146d133c7cc4
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/docker/defaults')
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml | 25 |
1 files changed, 13 insertions, 12 deletions
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 4f2cae9b75..6c445aa42a 100644 --- 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 }}" |