diff options
| author |   pmikus <pmikus@cisco.com> | 2021-02-15 16:16:31 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-02-19 11:57:30 +0000 |
| commit | 7b93e96740997dab4383140a639b055e074f63c1 (patch) | |
| tree | 8d54d10e65af9a6c58546fd3b36aed9cb8d174af /resources/tools/testbed-setup/ansible/roles/docker | |
| parent | ecfe59f83a49e0dda9cead06b81339e4ea545053 (diff) | |
Infra: Ansible Ubuntu Focal
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/docker')
4 files changed, 40 insertions, 5 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 9b182de4c4..8343558238 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml @@ -21,8 +21,8 @@ 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_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. diff --git a/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml b/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml index 4dfcd0b867..d89adb9a1a 100644 --- a/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml @@ -5,3 +5,5 @@ service: name: "docker" state: "{{ docker_restart_handler_state }}" + tags: + - docker-restart-service
\ No newline at end of file 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 a4e5857dbd..8bda4fed21 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 @@ -11,17 +11,20 @@ state: "present" cache_valid_time: 3600 install_recommends: False - tags: docker-inst-dependencies + tags: + - docker-inst-dependencies - name: Conf - Add APT Key apt_key: url: "{{ docker_apt_gpg_key }}" state: "{{ docker_apt_gpg_key_state }}" - tags: docker-conf-apt + tags: + - docker-conf-apt - name: Conf - Install APT Repository apt_repository: repo: "{{ docker_apt_repository }}" state: "{{ docker_apt_repository_state }}" update_cache: yes - tags: docker-conf-apt + tags: + - docker-conf-apt diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_focal.yaml b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_focal.yaml new file mode 100644 index 0000000000..84bd1c5824 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_focal.yaml @@ -0,0 +1,30 @@ +--- +# file: roles/docker/tasks/ubuntu_focal.yaml + +- name: Inst - Dependencies + apt: + name: + - "apt-transport-https" + - "ca-certificates" + - "gpg-agent" + - "software-properties-common" + state: "present" + cache_valid_time: 3600 + install_recommends: False + tags: + - docker-inst-dependencies + +- name: Conf - Add APT Key + apt_key: + url: "{{ docker_apt_gpg_key }}" + state: "{{ docker_apt_gpg_key_state }}" + tags: + - docker-conf-apt + +- name: Conf - Install APT Repository + apt_repository: + repo: "{{ docker_apt_repository }}" + state: "{{ docker_apt_repository_state }}" + update_cache: yes + tags: + - docker-conf-apt |