Skip to content

Commit

Permalink
Fixes geerlingguy#33: Fix deprecation warnings for 'include' in Ansib…
Browse files Browse the repository at this point in the history
…le 2.4+.
  • Loading branch information
geerlingguy committed Apr 27, 2018
1 parent 6830ddc commit b38b1d9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ services: docker
env:
- distro: centos7
redis_daemon: redis
# - distro: fedora24
# redis_daemon: redis
- distro: fedora27
redis_daemon: redis
- distro: ubuntu1604
redis_daemon: redis-server

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-redis.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-redis)

Installs [Redis](http://redis.io/) on RHEL/CentOS or Debian/Ubuntu.
Installs [Redis](http://redis.io/) on Linux.

## Requirements

Expand Down Expand Up @@ -108,7 +108,7 @@ None.

- hosts: all
roles:
- { role: geerlingguy.redis }
- role: geerlingguy.redis

## License

Expand Down
5 changes: 4 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ galaxy_info:
description: Redis for Linux
company: "Midwestern Mac, LLC"
license: "license (BSD, MIT)"
min_ansible_version: 2.0
min_ansible_version: 2.4
platforms:
- name: EL
versions:
Expand All @@ -28,3 +28,6 @@ galaxy_info:
- database
- development
- web
- redis
- cache
- performance
6 changes: 3 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
when: redis_package is not defined

# Setup/install tasks.
- include: setup-RedHat.yml
- include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat'

- include: setup-Debian.yml
- include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'

- include: setup-Archlinux.yml
- include_tasks: setup-Archlinux.yml
when: ansible_os_family == 'Archlinux'

- name: Ensure Redis is configured.
Expand Down

0 comments on commit b38b1d9

Please sign in to comment.