Merge "Remove ansible<2.2 apt cache hack"

tasks/neutron_install-apt.yml

@@ -17,6 +17,8 @@
   apt:
     pkg: ubuntu-cloud-keyring
     state: "{{ neutron_package_state }}"
+    update_cache: yes
+    cache_valid_time: "{{ cache_timeout }}"
   register: add_uca_keys
   when: neutron_uca_enable | bool
 
@@ -24,27 +26,16 @@
   apt_repository:
     repo: "{{ uca_repo }}"
     state: present
+    update_cache: yes
   register: add_uca_repo
   when: neutron_uca_enable | bool
 
-#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
-#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
-#in 1.9.x or we move to 2.0 (if tested working)
-- name: Check apt last update file
-  stat:
-    path: /var/cache/apt
-  register: apt_cache_stat
-
-- name: Update apt if needed
-  apt:
-    update_cache: yes
-  when: ("ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}" or
-        add_uca_keys | changed or add_uca_repo | changed)
-
 - name: Install neutron apt dependencies
   apt:
     pkg: "{{ item }}"
     state: "{{ neutron_package_state }}"
+    update_cache: yes
+    cache_valid_time: "{{ cache_timeout }}"
   register: install_packages
   until: install_packages|success
   retries: 5