From cfeb18a90f17d7bc11a52a913308a5f08be20e01 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 26 Apr 2018 20:28:46 -0500 Subject: [PATCH] Switch uses of deprecated (as of Ansible 2.4) include syntax to include_tasks. --- README.md | 4 ++-- meta/main.yml | 4 +++- tasks/main.yml | 8 ++++---- tests/README.md | 2 -- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 01d349b..b33fc08 100644 --- a/README.md +++ b/README.md @@ -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) -An Ansible Role that installs Ansible on RHEL/CentOS and Debian/Ubuntu. +An Ansible Role that installs Ansible on Linux servers. ## Requirements @@ -20,7 +20,7 @@ None. - hosts: servers roles: - - { role: geerlingguy.ansible } + - role: geerlingguy.ansible ## License diff --git a/meta/main.yml b/meta/main.yml index 95484ed..5a19f7a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: description: Ansible for RedHat/CentOS/Debian/Ubuntu. company: "Midwestern Mac, LLC" license: "license (BSD, MIT)" - min_ansible_version: 2.0 + min_ansible_version: 2.4 platforms: - name: EL versions: @@ -26,3 +26,5 @@ galaxy_info: - packaging - development - cloud + - ansible + - automation diff --git a/tasks/main.yml b/tasks/main.yml index ed8cc7a..88e6ada 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,13 +1,13 @@ --- # Setup/install tasks. -- include: setup-RedHat.yml +- include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora' -- include: setup-Fedora.yml +- include_tasks: setup-Fedora.yml when: ansible_distribution == 'Fedora' -- include: setup-Ubuntu.yml +- include_tasks: setup-Ubuntu.yml when: ansible_distribution == 'Ubuntu' -- include: setup-Debian.yml +- include_tasks: setup-Debian.yml when: ansible_distribution == 'Debian' diff --git a/tests/README.md b/tests/README.md index c8795f6..6fb2117 100644 --- a/tests/README.md +++ b/tests/README.md @@ -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` 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)`