From bf3ce71ec5074eb30a866ea8b6e01aad03d58e64 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 14 Mar 2019 08:02:56 +0000 Subject: Add PAPI dependencies + Various small structure optmizations Change-Id: I1aac9353f72436de53797fc734bef498905c8189 Signed-off-by: Peter Mikus --- .../ansible/roles/tg_sut/tasks/main.yaml | 49 +++++---- .../ansible/roles/tg_sut/tasks/ubuntu.yaml | 116 -------------------- .../ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml | 117 +++++++++++++++++++++ 3 files changed, 148 insertions(+), 134 deletions(-) delete mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml create mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml (limited to 'resources/tools/testbed-setup/ansible/roles/tg_sut/tasks') diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml index e5da2fc72d..1ad96b26fc 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml @@ -1,22 +1,16 @@ --- # file: roles/tg_sut/tasks/main.yaml -- 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: x86 specific - import_tasks: x86_64.yaml - when: ansible_machine == 'x86_64' +- name: Machine specifics + include_tasks: '{{ ansible_machine }}.yaml' - name: skylake specific import_tasks: skylake.yaml when: ("skylake" in groups) and inventory_hostname in groups['skylake'] -- name: aarch specific - import_tasks: aarch64.yaml - when: ansible_machine == 'aarch64' - - name: Copy netplan network config file template: src: 'files/netplan_config' @@ -53,21 +47,40 @@ mode: '0644' tags: copy-cpufrequtils -- name: Copy Python requirements file - copy: - src: 'files/requirements.txt' - dest: '/tmp/requirements.txt' - tags: copy-pip - - name: Set ondemand service to disable service: name: 'ondemand' enabled: 'no' tags: set-ondemand -- name: Install PIP requirements +- name: Install CSIT PIP requirements + pip: + name: '{{ item }}' + with_items: + - 'docopt==0.6.2' + - 'ecdsa==0.13' + - 'enum34==1.1.2' + - 'ipaddress==1.0.16' + - 'paramiko==1.16.0' + - 'pexpect==4.6.0' + - 'pycrypto==2.6.1' + - 'pykwalify==1.5.0' + - 'pypcap==1.1.5' + - 'python-dateutil==2.4.2' + - 'PyYAML==3.11' + - 'requests==2.9.1' + - 'robotframework==2.9.2' + - 'scapy==2.3.1' + - 'scp==0.10.2' + - 'six==1.12.0' + - 'dill==0.2.8.2' + - 'numpy==1.14.5' + - 'scipy==1.1.0' + tags: install-pip + +- name: Install VPP PIP requirements pip: - requirements: '/tmp/requirements.txt' + name: 'aenum' tags: install-pip - name: Load vfio-pci by default diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml deleted file mode 100644 index 2f75ae545d..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml +++ /dev/null @@ -1,116 +0,0 @@ ---- -# file: roles/tg_sut/tasks/ubuntu.yaml - -- name: Install CSIT dependencies - apt: - name: '{{ item }}' - state: 'present' - install_recommends: False - with_items: - - 'python-dev' - - 'python-virtualenv' - - 'python-pip' - - 'libpcap-dev' - - 'cpufrequtils' - - 'cgroup-bin' - - 'zlib1g-dev' - - 'apt-transport-https' - - 'ca-certificates' - - 'software-properties-common' - - 'cron' - - 'libnuma-dev' - tags: install-csit-dependencies - -- name: Add an Apt signing key, for docker-ce repository - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: 'present' - tags: install-docker - -- name: Install Docker APT repository - apt_repository: - repo: '{{ docker_repository }}' - state: 'present' - update_cache: True - tags: install-docker - -- name: Install Docker - apt: - name: 'docker-{{ docker_edition }}={{ docker_apt_package_name }}' - state: 'present' - tags: install-docker - -- name: Creates Docker service directory - file: - path: '/etc/systemd/system/docker.service.d' - state: 'directory' - -- name: Setup Docker http proxy - template: - src: 'templates/docker.service.proxy.http' - dest: '/etc/systemd/system/docker.service.d/http-proxy.conf' - owner: 'root' - group: 'root' - mode: '0644' - register: docker_register_systemd_service - when: proxy_env is defined and proxy_env.http_proxy is defined - tags: copy-docker - -- name: Setup Docker https proxy - template: - src: 'templates/docker.service.proxy.https' - dest: '/etc/systemd/system/docker.service.d/https-proxy.conf' - owner: 'root' - group: 'root' - mode: '0644' - register: docker_register_systemd_service - when: proxy_env is defined and proxy_env.https_proxy is defined - tags: copy-docker - -- name: Reload systemd daemon - command: 'systemctl daemon-reload' - notify: ['Restart Docker'] - when: (docker_register_systemd_service and - docker_register_systemd_service is changed) - tags: restart-docker - -- name: Set specific users to docker group - user: - name: '{{ item }}' - groups: 'docker' - append: True - with_items: '{{ docker_users }}' - when: docker_users - tags: set-docker - -- name: Add an Apt signing key, for Kubernetes repository - apt_key: - url: https://packages.cloud.google.com/apt/doc/apt-key.gpg - state: 'present' - tags: install-kubernetes - -- name: Install kubernetes APT repository - apt_repository: - repo: '{{ kubernetes_repository }}' - state: 'present' - update_cache: True - tags: install-kubernetes - -- name: Install Kubernetes - apt: - name: '{{ item }}={{ kubernetes_apt_package_name }}' - state: 'present' - force: yes - with_items: - - 'kubeadm' - - 'kubectl' - - 'kubelet' - tags: install-kubernetes - -- name: Apply kubelet parameter - lineinfile: - path: '/etc/default/kubelet' - state: 'present' - regexp: '^KUBELET_EXTRA_ARGS=*' - line: 'KUBELET_EXTRA_ARGS=--feature-gates HugePages=false' - tags: install-kubernetes diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml new file mode 100644 index 0000000000..194609722e --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml @@ -0,0 +1,117 @@ +--- +# file: roles/tg_sut/tasks/ubuntu_bionic.yaml + +- name: Install CSIT dependencies + apt: + name: '{{ item }}' + state: 'present' + install_recommends: False + with_items: + - 'python-dev' + - 'python-virtualenv' + - 'python-pip' + - 'libpcap-dev' + - 'cpufrequtils' + - 'cgroup-bin' + - 'zlib1g-dev' + - 'apt-transport-https' + - 'ca-certificates' + - 'software-properties-common' + - 'cron' + - 'libnuma-dev' + tags: install-csit-dependencies + +- name: Add an Apt signing key, for docker-ce repository + apt_key: + url: https://download.docker.com/linux/ubuntu/gpg + state: 'present' + tags: install-docker + +- name: Install Docker APT repository + apt_repository: + repo: '{{ docker_repository }}' + state: 'present' + update_cache: True + tags: install-docker + +- name: Install Docker + apt: + name: 'docker-{{ docker_edition }}={{ docker_apt_package_name }}' + state: 'present' + force: yes + tags: install-docker + +- name: Creates Docker service directory + file: + path: '/etc/systemd/system/docker.service.d' + state: 'directory' + +- name: Setup Docker http proxy + template: + src: 'templates/docker.service.proxy.http' + dest: '/etc/systemd/system/docker.service.d/http-proxy.conf' + owner: 'root' + group: 'root' + mode: '0644' + register: docker_register_systemd_service + when: proxy_env is defined and proxy_env.http_proxy is defined + tags: copy-docker + +- name: Setup Docker https proxy + template: + src: 'templates/docker.service.proxy.https' + dest: '/etc/systemd/system/docker.service.d/https-proxy.conf' + owner: 'root' + group: 'root' + mode: '0644' + register: docker_register_systemd_service + when: proxy_env is defined and proxy_env.https_proxy is defined + tags: copy-docker + +- name: Reload systemd daemon + command: 'systemctl daemon-reload' + notify: ['Restart Docker'] + when: (docker_register_systemd_service and + docker_register_systemd_service is changed) + tags: restart-docker + +- name: Set specific users to docker group + user: + name: '{{ item }}' + groups: 'docker' + append: True + with_items: '{{ docker_users }}' + when: docker_users + tags: set-docker + +- name: Add an Apt signing key, for Kubernetes repository + apt_key: + url: https://packages.cloud.google.com/apt/doc/apt-key.gpg + state: 'present' + tags: install-kubernetes + +- name: Install kubernetes APT repository + apt_repository: + repo: '{{ kubernetes_repository }}' + state: 'present' + update_cache: True + tags: install-kubernetes + +- name: Install Kubernetes + apt: + name: '{{ item }}={{ kubernetes_apt_package_name }}' + state: 'present' + force: yes + with_items: + - 'kubeadm' + - 'kubectl' + - 'kubelet' + tags: install-kubernetes + +- name: Apply kubelet parameter + lineinfile: + path: '/etc/default/kubelet' + state: 'present' + regexp: '^KUBELET_EXTRA_ARGS=*' + line: 'KUBELET_EXTRA_ARGS=--feature-gates HugePages=false' + tags: install-kubernetes -- cgit 1.2.3-korg