diff options
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/common')
3 files changed, 59 insertions, 38 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml index 5517b20e1f..43e40ebdf6 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml @@ -1,7 +1,7 @@ --- # file: roles/common/defaults/main.yaml -packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}" +packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}" packages_base: - "autoconf" @@ -17,23 +17,37 @@ packages_base: packages_by_distro: ubuntu: - - "build-essential" - - "libpcap-dev" - - "net-tools" - - "python-all" - - "python-apt" - - "python-cffi" - - "python-cffi-backend" - - "python-dev" - - "python-pip" - - "python-setuptools" - - "python3-all" - - "python3-apt" - - "python3-cffi" - - "python3-cffi-backend" - - "python3-dev" - - "python3-pip" - - "python3-setuptools" + bionic: + - "build-essential" + - "libpcap-dev" + - "net-tools" + - "python-all" + - "python-apt" + - "python-cffi" + - "python-cffi-backend" + - "python-dev" + - "python-pip" + - "python-setuptools" + - "python3-all" + - "python3-apt" + - "python3-cffi" + - "python3-cffi-backend" + - "python3-dev" + - "python3-pip" + - "python3-pyelftools" + - "python3-setuptools" + focal: + - "build-essential" + - "libpcap-dev" + - "net-tools" + - "python3-all" + - "python3-apt" + - "python3-cffi" + - "python3-cffi-backend" + - "python3-dev" + - "python3-pip" + - "python3-pyelftools" + - "python3-setuptools" packages_by_arch: aarch64: @@ -55,5 +69,4 @@ packages_by_arch: # ftp_proxy: http://proxy.com:80 # FTP_PROXY: http://proxy.com:80 # no_proxy: localhost,127.0.0.1,{{ ansible_default_ipv4.address }} -# NO_PROXY: localhost,127.0.0.1,{{ ansible_default_ipv4.address }} - +# NO_PROXY: localhost,127.0.0.1,{{ ansible_default_ipv4.address }}
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml index e7327d3944..bb317e8067 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml @@ -1,7 +1,7 @@ --- # file: roles/common/handlers/main.yaml -- name: Reboot server +- name: Reboot Server reboot: reboot_timeout: 3600 tags: 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 e60b32ae2a..91fcd188a6 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml @@ -1,7 +1,7 @@ --- # file: roles/common/tasks/main.yaml -- name: Add permanent proxy settings +- name: Conf - Add permanent proxy settings lineinfile: path: "/etc/environment" state: "present" @@ -9,17 +9,25 @@ with_dict: "{{ proxy_env }}" when: proxy_env is defined tags: - - set-proxy + - common-conf-proxy -- name: Install Distribution - Release - Machine Prerequisites +- name: Inst - Update package cache (apt) + apt: + update_cache: yes + cache_valid_time: 3600 + when: + - ansible_distribution|lower == 'ubuntu' + tags: + - common-inst-prerequisites + +- name: Inst - Prerequisites package: name: "{{ packages | flatten(levels=1) }}" state: latest - update_cache: true tags: - - install-dependencies + - common-inst-prerequisites -- name: Install CSIT PIP requirements +- name: Inst - CSIT PIP requirements pip: name: - "ecdsa==0.13.3" @@ -31,7 +39,7 @@ - "robotframework==3.1.2" - "scapy==2.4.3" - "scp==0.13.2" - - "ansible==2.7.8" + - "ansible==2.10.7" - "dill==0.2.8.2" - "numpy==1.17.3" - "hdrhistogram==0.6.1" @@ -73,24 +81,24 @@ - "sphinxcontrib-serializinghtml==1.1.3" - "urllib3==1.25.6" tags: - - install-pip + - common-inst-pip -- name: Install CSIT PIP requirements - Pandas and SciPy workaround +- name: Inst - CSIT PIP requirements - Pandas and SciPy workaround pip: name: - "pandas==0.25.3" - - "scipy==1.1.0" + - "scipy==1.5.4" tags: - - install-pip + - common-inst-pip -- name: Install Meson (repository version is too old) +- name: Inst - Meson (DPDK) pip: name: - "meson==0.47.1" tags: - - install-meson + - common-inst-meson -- name: Set sudoers admin +- name: Conf - sudoers admin lineinfile: path: "/etc/sudoers" state: "present" @@ -98,9 +106,9 @@ line: "%admin ALL=(ALL) ALL" validate: "/usr/sbin/visudo -cf %s" tags: - - set-sudoers + - common-conf-sudoers -- name: Set sudoers sudo +- name: Conf - sudoers nopasswd lineinfile: path: "/etc/sudoers" state: "present" @@ -108,6 +116,6 @@ line: "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" validate: "/usr/sbin/visudo -cf %s" tags: - - set-sudoers + - common-conf-sudoers - meta: flush_handlers |