From 0e6a776c76899004aad4427019816e3373e51a91 Mon Sep 17 00:00:00 2001
From: "Donovan Francesco (drifterza)" <donovan.francesco@gmail.com>
Date: Thu, 24 Nov 2016 16:39:41 +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: I86f152d2e59b783cb8828fa6af82ebfb3d7ce7e5
Related-Bug: #1642654
---
 tasks/glance_install.yml     | 19 +++++++++++++------
 tasks/glance_install_apt.yml | 25 -------------------------
 tasks/glance_install_yum.yml | 24 ------------------------
 3 files changed, 13 insertions(+), 55 deletions(-)
 delete mode 100644 tasks/glance_install_apt.yml
 delete mode 100644 tasks/glance_install_yum.yml

diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index 6506ace5..c2b0998d 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -13,15 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: glance_install_apt.yml
-  static: no
+- name: Ensure apt cache is up to date
+  apt:
+    update_cache: yes
+    cache_valid_time: "{{ cache_timeout }}"
   when:
     - ansible_pkg_mgr == 'apt'
 
-- include: glance_install_yum.yml
-  static: no
-  when:
-    - ansible_pkg_mgr == 'yum'
+- name: Install distro packages
+  package:
+    name: "{{ item }}"
+    state: "{{ glance_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ glance_distro_packages }}"
 
 - name: Create developer mode constraint file
   copy:
diff --git a/tasks/glance_install_apt.yml b/tasks/glance_install_apt.yml
deleted file mode 100644
index 795fa7e4..00000000
--- a/tasks/glance_install_apt.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016, Intel Corporation.
-#
-# 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.
-
-- name: Install apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ glance_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ glance_distro_packages }}"
diff --git a/tasks/glance_install_yum.yml b/tasks/glance_install_yum.yml
deleted file mode 100644
index cac8addd..00000000
--- a/tasks/glance_install_yum.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# 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.
-
-- name: Install yum packages
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ glance_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ glance_distro_packages }}"