Ansible: Fix package cache updates

Signed-off-by: Tomas Alexy <tomas.alexy@pantheon.tech>
Change-Id: I5c7b2636bde999fef3a60e6cbf2b36db9978a74a

diff --git a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
index 9153198..c422b4d 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
@@ -1,9 +1,15 @@
 ---
 # file: roles/ab/tasks/main.yaml
 
 ---
 # file: roles/ab/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Install Apache ab tools
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: present
 - name: Install Apache ab tools
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: present

-    update_cache: true

   tags: install-ab
   tags: install-ab

diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
index a6e8898..877304c 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/calibration/tasks/main.yaml
 
 ---
 # file: roles/calibration/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

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 e60b32a..7be6f73 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -11,11 +11,17 @@
   tags:
     - set-proxy
 
   tags:
     - set-proxy
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml
index f87590e..d4be90b 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/consul/tasks/main.yaml
 
 ---
 # file: roles/consul/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - consul-inst-prerequisites
 
   tags:
     - consul-inst-prerequisites
 

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 2e82c55..a4e5857 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
@@ -23,5 +23,5 @@
   apt_repository:
     repo: "{{ docker_apt_repository }}"
     state: "{{ docker_apt_repository_state }}"
   apt_repository:
     repo: "{{ docker_apt_repository }}"
     state: "{{ docker_apt_repository_state }}"

-    update_cache: True
+    update_cache: yes

   tags: docker-conf-apt
   tags: docker-conf-apt

diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
index 1b4e398..a38a9ee 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/dpdk/tasks/main.yaml
 
 ---
 # file: roles/dpdk/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: DPDK - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: DPDK - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml
index 8233ba7..00940e4 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/iperf/tasks/main.yaml
 
 ---
 # file: roles/iperf/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: iPerf - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: iPerf - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
index ddb885f..454e80e 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
@@ -22,7 +22,7 @@
   apt_repository:
     repo: '{{ kubernetes_apt_repository }}'
     state: '{{ kubernetes_apt_repository_state }}'
   apt_repository:
     repo: '{{ kubernetes_apt_repository }}'
     state: '{{ kubernetes_apt_repository_state }}'

-    update_cache: True
+    update_cache: yes

   tags: install-kubernetes
 
 - name: Kubernetes - Install
   tags: install-kubernetes
 
 - name: Kubernetes - Install

diff --git a/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml
index 2fb6e2e..f677836 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/mellanox/tasks/main.yaml
 
 ---
 # file: roles/mellanox/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Mellanox Install - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Mellanox Install - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 


@@ -55,6 +61,5 @@
   package:
     name: "qemu-system"
     state: latest
   package:
     name: "qemu-system"
     state: latest

-    update_cache: true

   tags:
     - install-mellanox
   tags:
     - install-mellanox

diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
index e1341b3..5b32305 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/nomad/tasks/main.yaml
 
 ---
 # file: roles/nomad/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - nomad-inst-prerequisites
 
   tags:
     - nomad-inst-prerequisites
 

diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
index c437b40..608d3e2 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/performance_tuning/tasks/main.yaml
 
 ---
 # file: roles/performance_tuning/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Performance Tuning - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Performance Tuning - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml
index 310803c..23cca05 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml
@@ -1,12 +1,18 @@
 ---
 # file: roles/performance_tuning/tasks/turbo_boost.yaml
 
 ---
 # file: roles/performance_tuning/tasks/turbo_boost.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Turbo Boost - Install msr-tools
   package:
     name:
       - "msr-tools"
     state: latest
 - name: Turbo Boost - Install msr-tools
   package:
     name:
       - "msr-tools"
     state: latest

-    update_cache: true

   tags:
     - turbo-boost
 
   tags:
     - turbo-boost
 

diff --git a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
index 019a27f..1e442f5 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/trex/tasks/main.yaml
 
 ---
 # file: roles/trex/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml
index 174373c..06930b2 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml
@@ -1,11 +1,17 @@
 ---
 # file: roles/sut/tasks/main.yaml
 
 ---
 # file: roles/sut/tasks/main.yaml
 

+- Name: Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+

 - name: SUT - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
 - name: SUT - Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest

-    update_cache: true

   tags:
     - install-dependencies
 
   tags:
     - install-dependencies
 

diff --git a/resources/tools/vagrant/ansible/roles/csit/tasks/main.yml b/resources/tools/vagrant/ansible/roles/csit/tasks/main.yml
index 6f226fd..9c8f575 100644 (file)
--- a/resources/tools/vagrant/ansible/roles/csit/tasks/main.yml
+++ b/resources/tools/vagrant/ansible/roles/csit/tasks/main.yml
@@ -62,7 +62,6 @@
   package:
     name: "{{ csit_packages | join(',') }}"
     state: 'latest'
   package:
     name: "{{ csit_packages | join(',') }}"
     state: 'latest'

-    update_cache: 'yes'

 
 - name: Adjust number of hugepages
   sysctl:
 
 - name: Adjust number of hugepages
   sysctl: