Skip to content

Commit 68c7d7c

Browse files
authored
Merge pull request #293 from gclough/upgrade_include_deprecation
Updated to use "import_tasks" instead of "include"
2 parents 503a94d + 708476a commit 68c7d7c

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
- IMAGE_NAME="centos:6-builded"
1818

1919
install:
20-
- pip install ansible=="2.3.1.0" docker-py
20+
- pip install ansible=="2.4.2.0" docker-py
2121
- ln -s ${PWD} tests/docker/ANXS.postgresql
2222

2323
script:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Ansible role which installs and configures PostgreSQL, extensions, databases and
1010

1111
#### Installation
1212

13-
This has been tested on Ansible 1.9.4 and higher.
13+
This has been tested on Ansible 2.4.0 and higher.
1414

1515
To install:
1616

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ galaxy_info:
44
author: pjan vandaele
55
company: ANXS
66
description: "Install and configure PostgreSQL, dependencies, extensions, databases and users."
7-
min_ansible_version: 1.9.4
7+
min_ansible_version: 2.4.0
88
license: MIT
99
platforms:
1010
- name: Ubuntu

tasks/extensions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# file: postgresql/tasks/extensions.yml
22

3-
- include: extensions/contrib.yml
3+
- import_tasks: extensions/contrib.yml
44
when: postgresql_ext_install_contrib
5-
- include: extensions/dev_headers.yml
5+
- import_tasks: extensions/dev_headers.yml
66
when: postgresql_ext_install_dev_headers
7-
- include: extensions/postgis.yml
7+
- import_tasks: extensions/postgis.yml
88
when: postgresql_ext_install_postgis

tasks/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
- "../vars/empty.yml"
77
tags: [always]
88

9-
- include: install.yml
9+
- import_tasks: install.yml
1010
when: ansible_pkg_mgr == "apt"
1111
tags: [postgresql, postgresql-install]
1212

13-
- include: install_yum.yml
13+
- import_tasks: install_yum.yml
1414
when: ansible_pkg_mgr == "yum"
1515
tags: [postgresql, postgresql-install]
1616

17-
- include: extensions.yml
17+
- import_tasks: extensions.yml
1818
tags: [postgresql, postgresql-extensions]
1919

20-
- include: configure.yml
20+
- import_tasks: configure.yml
2121
tags: [postgresql, postgresql-configure]
2222

23-
- include: users.yml
23+
- import_tasks: users.yml
2424
tags: [postgresql, postgresql-users]
2525

26-
- include: databases.yml
26+
- import_tasks: databases.yml
2727
tags: [postgresql, postgresql-databases]
2828

29-
- include: users_privileges.yml
29+
- import_tasks: users_privileges.yml
3030
tags: [postgresql, postgresql-users]
3131

32-
- include: monit.yml
32+
- import_tasks: monit.yml
3333
when: monit_protection is defined and monit_protection == true
3434
tags: [postgresql, postgresql-monit]

0 commit comments

Comments
 (0)