Skip to content

Commit

Permalink
Use package module to install distro packages
Browse files Browse the repository at this point in the history
Consolidate distro package install tasks into a
single task using the package module and pass
the package list into the name instead of using
a with_items loop.

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: Id00e704fd89f5dc40a143a9567c859ba78b76668
(cherry picked from commit f97d970)
  • Loading branch information
Jesse Pretorius committed May 4, 2017
1 parent dda6ec4 commit 8214ccf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 65 deletions.
2 changes: 1 addition & 1 deletion meta/main.yml
Expand Up @@ -18,7 +18,7 @@ galaxy_info:
description: Installation and setup of cloudkitty
company: Rackspace
license: Apache2
min_ansible_version: 2.0
min_ansible_version: 2.2
platforms:
- name: Ubuntu
versions:
Expand Down
21 changes: 10 additions & 11 deletions tasks/cloudkitty_install.yml
Expand Up @@ -15,17 +15,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.

- include: cloudkitty_install_apt.yml
static: no
when: ansible_pkg_mgr == 'apt'
tags:
- cloudkitty-install

- include: cloudkitty_install_yum.yml
static: no
when: ansible_pkg_mgr == 'yum'
tags:
- cloudkitty-install
- name: Install distro packages
package:
pkg: "{{ cloudkitty_distro_packages }}"
state: "{{ cloudkitty_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:
Expand Down
29 changes: 0 additions & 29 deletions tasks/cloudkitty_install_apt.yml

This file was deleted.

24 changes: 0 additions & 24 deletions tasks/cloudkitty_install_yum.yml

This file was deleted.

0 comments on commit 8214ccf

Please sign in to comment.