diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-03-16 07:41:07 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-03-16 07:41:07 +0000 |
| commit | 648b88dded49db91bbdecf93fbc684e8c696752d (patch) | |
| tree | 4c3084c20d4eb750ef39bb6e1ff3efd6ef1eced7 /resources/tools/testbed-setup/ansible/roles/tg_sut/tasks | |
| parent | 5523f7ecbafd43f7c3d8a17c24bc70d83db39c0c (diff) | |
FIX: Ansible warnings of deprecation
[DEPRECATION WARNING]: Invoking "apt" only once while using a
loop via squash_actions is deprecated.
+ aenum pip fix version
+ crypto dependencies
Change-Id: I7ca4de48d68ec4d8a8f57fedf204fa6710a3e75f
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/tg_sut/tasks')
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml | 6 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml | 35 |
2 files changed, 19 insertions, 22 deletions
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 1ad96b26fc..d9026e9182 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 @@ -55,8 +55,7 @@ - name: Install CSIT PIP requirements pip: - name: '{{ item }}' - with_items: + name: - 'docopt==0.6.2' - 'ecdsa==0.13' - 'enum34==1.1.2' @@ -80,7 +79,8 @@ - name: Install VPP PIP requirements pip: - name: 'aenum' + name: + - 'aenum==2.1.2' tags: install-pip - name: Load vfio-pci by default 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 index 194609722e..fd08215aa5 100644 --- 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 @@ -3,22 +3,20 @@ - name: Install CSIT dependencies apt: - name: '{{ item }}' + name: + - 'python-dev' + - 'python-virtualenv' + - 'python-pip' + - 'libpcap-dev' + - 'cpufrequtils' + - 'cgroup-bin' + - 'zlib1g-dev' + - 'apt-transport-https' + - 'ca-certificates' + - 'software-properties-common' + - 'libnuma-dev' 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 @@ -99,13 +97,12 @@ - name: Install Kubernetes apt: - name: '{{ item }}={{ kubernetes_apt_package_name }}' + name: + - 'kubeadm={{ kubernetes_apt_package_name }}' + - 'kubectl={{ kubernetes_apt_package_name }}' + - 'kubelet={{ kubernetes_apt_package_name }}' state: 'present' force: yes - with_items: - - 'kubeadm' - - 'kubectl' - - 'kubelet' tags: install-kubernetes - name: Apply kubelet parameter |