From 860ff80b348f1c9e93745da55b1df69d05283afb Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 21 Apr 2017 16:56:49 +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: I165479e62e921adb2a46fcbdb3b7c0118b2ef739 (cherry picked from commit 9a11687bd0da5a44b9d22bdeaa20dcf38663c58f) --- meta/main.yml | 2 +- tasks/repo_install.yml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 9775844..850376d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Install package repo server company: Rackspace license: Apache2 - min_ansible_version: 1.6.6 + min_ansible_version: 2.2 platforms: - name: Ubuntu versions: diff --git a/tasks/repo_install.yml b/tasks/repo_install.yml index 42d11b1..0c31afe 100644 --- a/tasks/repo_install.yml +++ b/tasks/repo_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 repo server packages package: name: "{{ item }}" state: "{{ repo_server_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