From d63b6ce810a0d091855ef2e12bf3ce89718a413f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Thu, 3 Nov 2016 23:42:47 +0000
Subject: [PATCH] Remove ansible<2.2 apt cache hack

Now ansible apt module correctly behaves, so it's time
to deprecate these cruft tasks for apt.

Change-Id: I8c6fe61eca963aae5bbda5cf81481c420b952a37
---
 tasks/rhel6stig/apt.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tasks/rhel6stig/apt.yml b/tasks/rhel6stig/apt.yml
index 18b875af..221f385e 100644
--- a/tasks/rhel6stig/apt.yml
+++ b/tasks/rhel6stig/apt.yml
@@ -13,20 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#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
-  tags:
-    - auditd-apt-packages
-
 - name: Update apt if needed
   apt:
     update_cache: yes
-  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
+    cache_valid_time: "{{ cache_timeout }}"
   tags:
     - auditd-apt-packages