From e04b4f4b307b2a6fa63a15fc56a1d372cdbb8a32 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 3 Nov 2016 23:38:22 +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: I33a3ee6cfafb58ba87639d8ad63157844baae35e --- tasks/install-apt.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tasks/install-apt.yml b/tasks/install-apt.yml index bec79ea5..aca0626a 100644 --- a/tasks/install-apt.yml +++ b/tasks/install-apt.yml @@ -13,23 +13,12 @@ # 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 - -- name: Update apt if needed - apt: - update_cache: yes - when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}" - - name: Install apt packages apt: pkg: "{{ item }}" state: "{{ swift_package_state }}" + update_cache: yes + cache_valid_time: "{{ cache_timeout }}" register: install_packages until: install_packages|success retries: 5