Merge "Use package module to install distro packages"

meta/main.yml

@@ -23,7 +23,7 @@ galaxy_info:
   description: "Openstack Monasca"
   company: "Internet Solutions"
   license: "license (Apache)"
-  min_ansible_install: 1.9
+  min_ansible_install: 2.2
   platforms:
     - name: Ubuntu
       versions:

tasks/install.yml

@@ -16,9 +16,16 @@
 # (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 
-- include: monasca_install_apt.yml
-  static: no
-  when: ansible_pkg_mgr == 'apt'
+- name: Install distro packages
+  package:
+    name: "{{ monasca_distro_packages }}"
+    state: "{{ monasca_package_state }}"
+    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
+  register: install_packages
+  until: install_packages | success
+  retries: 5
+  delay: 2
 
 - name: Create developer mode constraint file
   copy:

tasks/monasca_install_apt.yml

@@ -1,26 +0,0 @@
----
-# Copyright 2016, Walmart Stores, 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 for monasca
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ monasca_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_monasca_distro_packages
-  until: install_monasca_distro_packages |success
-  retries: 5
-  delay: 2
-  with_items: "{{ monasca_distro_packages }}"