From 83bdedd4b29cceff11651ba73b61e89b7d44201d Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Thu, 7 Sep 2017 14:27:53 +0000 Subject: [PATCH] Revert "Fix lint issue" This also adds an exception to ansible-lint, ANSIBLE0006, because we want to use "apt-get update" for updating the apt cache [1] [1]: https://review.openstack.org/#/c/492716/ This reverts commit 5fe5b6ca1a2777989413d8375b8e98a649e03ab8. Change-Id: Icd79198964e86c7a2c73102f3e4d845d161b924d --- roles/configure-mirrors/tasks/mirror.yaml | 3 +-- tox.ini | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/configure-mirrors/tasks/mirror.yaml b/roles/configure-mirrors/tasks/mirror.yaml index 1f041e396..d96d7ffc7 100644 --- a/roles/configure-mirrors/tasks/mirror.yaml +++ b/roles/configure-mirrors/tasks/mirror.yaml @@ -22,6 +22,5 @@ # Make sure OS does not have a stale package cache. - name: Update apt cache become: yes - apt: - update_cache: yes + command: apt-get update when: ansible_os_family == 'Debian' diff --git a/tox.ini b/tox.ini index 00c32103f..e1c23342b 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,7 @@ commands = # NOTE(pabelanger): Ignore the following checks: # ANSIBlE0012: Commands should not change things if nothing needs doing bash -c "find playbooks -type f -regex '.*.y[a]?ml' -print0 | xargs -n1 -0 \ - ansible-lint -x ANSIBLE0012 2> /dev/null" + ansible-lint -x ANSIBLE0006,ANSIBLE0012 2> /dev/null" [testenv:venv] commands = {posargs}