From 7db10248f9901f6b47ad5abe24a69a3ae27693f4 Mon Sep 17 00:00:00 2001
From: "Donovan Francesco (drifterza)" <donovan.francesco@gmail.com>
Date: Mon, 28 Nov 2016 18:19:22 +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: Ic4ac593ec53fc6e7e420c0bd31975f1fa34fbb06
Related-Bug: #1642654
---
 tasks/install-apt.yml   | 26 --------------------------
 tasks/install-yum.yml   | 33 ---------------------------------
 tasks/swift_install.yml | 32 ++++++++++++++++++++++++++------
 3 files changed, 26 insertions(+), 65 deletions(-)
 delete mode 100644 tasks/install-apt.yml
 delete mode 100644 tasks/install-yum.yml

diff --git a/tasks/install-apt.yml b/tasks/install-apt.yml
deleted file mode 100644
index aca0626a..00000000
--- a/tasks/install-apt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Copyright 2014, 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 apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ swift_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ swift_distro_packages }}"
diff --git a/tasks/install-yum.yml b/tasks/install-yum.yml
deleted file mode 100644
index 0eda2db2..00000000
--- a/tasks/install-yum.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# Copyright 2014, 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 RDO package
-  yum:
-    pkg: "{{ rdo_package }}"
-    state: "present"
-  register: install_cloud_rdo_package
-  until: install_cloud_rdo_package | success
-  retries: 5
-  delay: 2
-
-- name: Install yum packages
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ swift_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ swift_distro_packages }}"
diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml
index 99598139..d3071817 100644
--- a/tasks/swift_install.yml
+++ b/tasks/swift_install.yml
@@ -13,13 +13,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: 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'
 
-- include: install-yum.yml
-  static: no
-  when: ansible_pkg_mgr == 'yum'
+- name: Install RDO package
+  package:
+    name: "{{ rdo_package }}"
+    state: "present"
+  register: install_cloud_rdo_package
+  until: install_cloud_rdo_package | success
+  retries: 5
+  delay: 2
+  when:
+    - ansible_pkg_mgr == 'yum'
+
+- name: Install distro packages
+  package:
+    name: "{{ item }}"
+    state: "{{ swift_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ swift_distro_packages }}"
 
 - name: Create developer mode constraint file
   copy: