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] https://github.com/ansible/ansible-modules-core/issues/1497

Change-Id: I8f4ed2a836b118080bf4698786caab7847f6e799
This commit is contained in:
Jesse Pretorius 2017-05-02 10:22:18 +01:00
parent 8ecf958568
commit 8ce2ae13cf
4 changed files with 5 additions and 36 deletions

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -1,30 +0,0 @@
---
# Copyright 2017, Marc Gariépy <gariepy.marc@gmail.com>
#
# 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 ceph packages
yum:
name: '{{ item.1 }}'
state: "{{ ceph_client_package_state }}"
register: install_packages
until: install_packages|success
retries: 5
delay: 2
with_subelements:
- "{{ ceph_components }}"
- package
when:
- inventory_hostname in groups[item.0.component]
notify:
- Restart os services