Use package module to install distro packages

Consolidate distro package install tasks into a single task using the package module. The minimum Ansible version is raised to 2.2 due to a known bug [1] in Ansible's apt module which does not update the cache properly if the cache update and the install are combined in a single task. [1] ansible/ansible-modules-core#1497 Change-Id: I8f4ed2a836b118080bf4698786caab7847f6e799 (cherry picked from commit 8ce2ae1)
openstack · May 3, 2017 · d1b30ae · d1b30ae
1 parent 3e03b7b
commit d1b30ae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 36 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and configuration of the ceph client
   company: OpenStack Foundation
   license: Apache2
-  min_ansible_version: 1.9.4
+  min_ansible_version: 2.2
   platforms:
     - name: Ubuntu
       versions:

diff --git a/tasks/ceph_all.yml b/tasks/ceph_all.yml
@@ -25,13 +25,12 @@
     - always
 
 - include: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
-  static: no
   when:
     - ceph_pkg_source != 'distro'
   tags:
     - ceph-install
 
-- include: "ceph_install_{{ ansible_pkg_mgr }}.yml"
+- include: ceph_install.yml
   tags:
     - ceph-install
 

diff --git a/tasks/ceph_install_apt.yml → tasks/ceph_install.yml b/tasks/ceph_install_apt.yml → tasks/ceph_install.yml
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 - name: Install ceph packages
-  apt:
+  package:
     name: '{{ item.1 }}'
     state: "{{ ceph_client_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
+    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

diff --git a/tasks/ceph_install_yum.yml b/tasks/ceph_install_yum.yml