From e0cee746f41ce22eecd7e53962e3021376df9d21 Mon Sep 17 00:00:00 2001
From: "Donovan Francesco (drifterza)" <donovan.francesco@gmail.com>
Date: Thu, 24 Nov 2016 18:25:13 +0200
Subject: [PATCH] Use new ansible package module to install distro packages.

From Newton onwards we're able to take advantage of
the Ansible package module, instead of conditionally
executing the apt or yum module.

Implementing this is an optimisation which we can do
in master and backport to stable/newton,
reducing the execution time.

Reference: http://docs.ansible.com/ansible/package_module.html

Change-Id: Id2f6ff7e1bd016e07f0b7a10d9ef2844070eb1c5
Related-Bug: #1642654
---
 tasks/trove_install.yml     | 19 ++++++++++++++++---
 tasks/trove_install_apt.yml | 29 -----------------------------
 vars/ubuntu-14.04.yml       |  2 +-
 vars/ubuntu-16.04.yml       |  2 +-
 4 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 tasks/trove_install_apt.yml

diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml
index 9c15030..0d8065e 100644
--- a/tasks/trove_install.yml
+++ b/tasks/trove_install.yml
@@ -16,9 +16,22 @@
 # (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 
-- include: trove_install_apt.yml
-  static: no
-  when: ansible_pkg_mgr == 'apt'
+- 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: "{{ trove_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ trove_distro_packages }}"
 
 - name: Create developer mode constraint file
   copy:
diff --git a/tasks/trove_install_apt.yml b/tasks/trove_install_apt.yml
deleted file mode 100644
index e9de154..0000000
--- a/tasks/trove_install_apt.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Copyright 2016 Internet Solutions (Pty) Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
-# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
-
-- name: Install apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ trove_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ trove_apt_packages }}"
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index 7d9cf1e..68dc2e9 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -17,7 +17,7 @@
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 cache_timeout: 600
 
-trove_apt_packages:
+trove_distro_packages:
   - apache2
   - apache2-utils
   - libapache2-mod-wsgi
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 7d9cf1e..68dc2e9 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -17,7 +17,7 @@
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 cache_timeout: 600
 
-trove_apt_packages:
+trove_distro_packages:
   - apache2
   - apache2-utils
   - libapache2-mod-wsgi