From 96c46dcf2fb97137b9a7f477be3fb65adf0dd742 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 21 Apr 2017 16:47:13 +0100 Subject: [PATCH] Optimise apt cache update task The update of the apt cache and the package installation can all be handled in a single task by providing the package action plugin with the right parameters. This removes an extra task to optimise execution. The minimum Ansible version is raised to 2.2 due to a known bug [1] in Ansible's apt module which does not update the cache properly if the cache update and the install are combined in a single task. [1] https://github.com/ansible/ansible-modules-core/issues/1497 Change-Id: Id49a182f85217cac752f306147bd9f35cc6b9bd4 --- meta/main.yml | 2 +- tasks/sahara_install.yml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index e23a113..6d1299a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: Installation and setup of sahara company: LSD/UFCG license: Apache2 - min_ansible_version: 2.1 + min_ansible_version: 2.2 platforms: - name: Ubuntu versions: diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml index 19da176..c7dcc31 100644 --- a/tasks/sahara_install.yml +++ b/tasks/sahara_install.yml @@ -11,17 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Ensure apt cache is up to date - apt: - update_cache: yes - cache_valid_time: "{{ cache_timeout }}" - when: - - ansible_pkg_mgr == 'apt' - - name: Install distro packages package: name: "{{ item }}" state: "{{ sahara_package_state }}" + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages until: install_packages|success retries: 5