diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-03-14 08:02:56 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-03-14 08:52:08 +0000 |
| commit | bf3ce71ec5074eb30a866ea8b6e01aad03d58e64 (patch) | |
| tree | bd2fbf852a42ac41dd6b9e5df378f2f72474a0e3 /resources/tools/testbed-setup/ansible/roles/common/tasks | |
| parent | b285fff289f434f0aa988d282a218a9f84e21357 (diff) | |
Add PAPI dependencies
+ Various small structure optmizations
Change-Id: I1aac9353f72436de53797fc734bef498905c8189
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/common/tasks')
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml | 5 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml (renamed from resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml) | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml index 6844358eca..d7355883e0 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml @@ -9,9 +9,8 @@ with_dict: "{{ proxy_env }}" when: proxy_env is defined -- name: Ubuntu specific - import_tasks: ubuntu.yaml - when: ansible_distribution|lower == 'ubuntu' +- name: Install distribution - release - machine prerequisites + include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml' - name: Set hostname hostname: diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml index ae606cd494..d80eb5edac 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml @@ -1,24 +1,17 @@ --- -# file: roles/common/tasks/ubuntu.yaml +# file: roles/common/tasks/ubuntu_bionic.yaml -- name: Copy aarch64 apt sources file +- name: Copy apt sources file template: - src: 'files/apt-sources-arm.list' + src: 'files/apt-sources_{{ ansible_distribution_release }}_{{ ansible_machine }}.list' dest: '/etc/apt/sources.list' tags: copy-apt-sources - when: ansible_machine == 'aarch64' - -- name: Copy x86_64 apt sources file - template: - src: 'files/apt-sources.list' - dest: '/etc/apt/sources.list' - tags: copy-apt-sources - when: ansible_machine == 'x86_64' - name: Install CSIT dependencies apt: name: '{{ item }}' state: 'present' + cache_valid_time: 3600 install_recommends: False with_items: - 'python-apt' |