From 9d43b6ffd0cbd7b71637f1972fae3a18332a24f3 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 21 Apr 2017 16:46:02 +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: I69970a3a76e6ac56095d0077c31f811d717d9216 --- meta/main.yml | 2 +- tasks/neutron_install.yml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index f2a8ae71..6b5ff21a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Installation and setup of neutron company: Rackspace license: Apache2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Ubuntu versions: diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index 7e812e0a..308af07c 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_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 neutron role packages package: name: "{{ item }}" state: "{{ neutron_package_state }}" + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" with_items: - "{{ neutron_packages_list | selectattr('enabled') | sum(attribute='packages', start=[]) }}" when: