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: I2905f04f6f16373a34fe1e40a31b30a6d6edd00e
Related-Bug: #1642654

tasks/cinder_install.yml

@@ -13,11 +13,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: cinder_install_apt.yml
-  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: cinder_install_yum.yml
-  when: ansible_pkg_mgr == 'yum'
+- name: Install distro packages
+  package:
+    name: "{{ item }}"
+    state: "{{ cinder_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ cinder_distro_packages }}"
+
+- name: Install distro packages common between different backends
+  package:
+    name: "{{ item }}"
+    state: "{{ cinder_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ cinder_volume_distro_packages }}"
+  when:
+    - inventory_hostname in groups['cinder_volume']
+
+- name: Install distro packages for LVM backend
+  package:
+    name: "{{ item }}"
+    state: "{{ cinder_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ cinder_lvm_volume_distro_packages }}"
+  when:
+    - inventory_hostname in groups['cinder_volume']
+    - cinder_backend_lvm_inuse | bool
 
 - name: Create developer mode constraint file
   copy:

tasks/cinder_install_apt.yml

@@ -1,51 +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 apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ cinder_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_distro_packages }}"
-
-- name: Install apt packages common between different backends
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ cinder_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_volume_distro_packages }}"
-  when:
-    - inventory_hostname in groups['cinder_volume']
-
-- name: Install apt packages for LVM backend
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ cinder_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_lvm_volume_distro_packages }}"
-  when:
-    - inventory_hostname in groups['cinder_volume']
-    - cinder_backend_lvm_inuse | bool

tasks/cinder_install_yum.yml

@@ -1,50 +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: "{{ cinder_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_distro_packages }}"
-
-- name: Install yum packages common between different backends
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ cinder_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_volume_distro_packages }}"
-  when:
-    - inventory_hostname in groups['cinder_volume']
-
-- name: Install yum packages for LVM backend
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ cinder_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ cinder_lvm_volume_distro_packages }}"
-  when:
-    - inventory_hostname in groups['cinder_volume']
-    - cinder_backend_lvm_inuse | bool
-