Switch uses of deprecated (as of Ansible 2.4) include syntax to include_tasks.

This commit is contained in:
Jeff Geerling 2018-04-26 20:28:46 -05:00
parent 7603153bac
commit cfeb18a90f
4 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-ansible.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-ansible) [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-ansible.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-ansible)
An Ansible Role that installs Ansible on RHEL/CentOS and Debian/Ubuntu. An Ansible Role that installs Ansible on Linux servers.
## Requirements ## Requirements
@ -20,7 +20,7 @@ None.
- hosts: servers - hosts: servers
roles: roles:
- { role: geerlingguy.ansible } - role: geerlingguy.ansible
## License ## License

View File

@ -6,7 +6,7 @@ galaxy_info:
description: Ansible for RedHat/CentOS/Debian/Ubuntu. description: Ansible for RedHat/CentOS/Debian/Ubuntu.
company: "Midwestern Mac, LLC" company: "Midwestern Mac, LLC"
license: "license (BSD, MIT)" license: "license (BSD, MIT)"
min_ansible_version: 2.0 min_ansible_version: 2.4
platforms: platforms:
- name: EL - name: EL
versions: versions:
@ -26,3 +26,5 @@ galaxy_info:
- packaging - packaging
- development - development
- cloud - cloud
- ansible
- automation

View File

@ -1,13 +1,13 @@
--- ---
# Setup/install tasks. # Setup/install tasks.
- include: setup-RedHat.yml - include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora' when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
- include: setup-Fedora.yml - include_tasks: setup-Fedora.yml
when: ansible_distribution == 'Fedora' when: ansible_distribution == 'Fedora'
- include: setup-Ubuntu.yml - include_tasks: setup-Ubuntu.yml
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == 'Ubuntu'
- include: setup-Debian.yml - include_tasks: setup-Debian.yml
when: ansible_distribution == 'Debian' when: ansible_distribution == 'Debian'

View File

@ -9,5 +9,3 @@ To run the test playbook(s) in this directory:
1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh` 1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)` If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`