From 9dec3a6654b8e8397ecb51e14b1d9b1cd6167bd5 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 21 Apr 2017 16:48:00 +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: I532d866286d4cb885e1f3696819455cbdc8c0c39 (cherry picked from commit 49c3e0b727babeb713d1bf4d8048a4edd678a7d6) --- meta/main.yml | 2 +- tasks/swift_install.yml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 39c05452..1868b364 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Installation and setup of swift company: Rackspace license: Apache2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Ubuntu versions: diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml index 2de2061a..06979847 100644 --- a/tasks/swift_install.yml +++ b/tasks/swift_install.yml @@ -13,17 +13,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: "{{ swift_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