From 5cb7832ced8435eb83e0aa5b35f6f9507b27adaa Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 24 Apr 2018 15:35:39 -0500 Subject: [PATCH] Fixes #30: Fix deprecated use of include, bump minimum Ansible version to 2.4. --- meta/main.yml | 2 +- tasks/main.yml | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index db0b759..8ed8f82 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: description: PostgreSQL server for Linux. company: "Midwestern Mac, LLC" license: "license (BSD, MIT)" - min_ansible_version: 2.0 + min_ansible_version: 2.4 platforms: - name: EL versions: diff --git a/tasks/main.yml b/tasks/main.yml index 3e51114..6859c73 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,19 +1,16 @@ --- # Variable configuration. -- include: variables.yml - static: no +- include_tasks: variables.yml # Setup/install tasks. -- include: setup-RedHat.yml +- include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat' - static: no -- include: setup-Debian.yml +- include_tasks: setup-Debian.yml when: ansible_os_family == 'Debian' - static: no -- include: initialize.yml -- include: configure.yml +- include_tasks: initialize.yml +- include_tasks: configure.yml - name: Ensure PostgreSQL is started and enabled on boot. service: @@ -22,5 +19,5 @@ enabled: yes # Configure PostgreSQL. -- include: databases.yml -- include: users.yml +- import_tasks: databases.yml +- import_tasks: users.yml