diff options
Diffstat (limited to 'resources/tools/testbed-setup/ansible')
4 files changed, 17 insertions, 10 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 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 diff --git a/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml index 0dc7d19507..ab3d197791 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml @@ -1,6 +1,4 @@ --- # file: roles/docker/meta/main.yaml -dependencies: [] - - +dependencies: []
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml index f0cb0d19cf..8158af51b4 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml @@ -7,7 +7,9 @@ - name: Inst - Docker package: - name: "{{ docker_package }}" + name: + - "{{ docker_package }}" + - "{{ docker_package }}-cli" state: "{{ docker_package_state }}" tags: - docker-inst-package diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml index a38a0af110..2e82c552be 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml @@ -15,8 +15,8 @@ - name: Conf - Add APT Key apt_key: - url: "{{ docker_apt_key }}" - state: "{{ docker_apt_key_state }}" + url: "{{ docker_apt_gpg_key }}" + state: "{{ docker_apt_gpg_key_state }}" tags: docker-conf-apt - name: Conf - Install APT Repository |