From 549e18af314d407168bb33f01782a44981171971 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 5 Oct 2016 17:54:14 +0200 Subject: [PATCH] library/roles/postgresql/tasks/manage_pg_db.yml: Ansible 2 compatibility --- postgresql/tasks/manage_pg_db.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/postgresql/tasks/manage_pg_db.yml b/postgresql/tasks/manage_pg_db.yml index ff6554d..01ba1e7 100644 --- a/postgresql/tasks/manage_pg_db.yml +++ b/postgresql/tasks/manage_pg_db.yml @@ -3,7 +3,7 @@ become: True become_user: postgres postgresql_user: user={{ item.user }} password={{ item.pwd }} role_attr_flags={{ item.roles }} port={{ psql_db_port }} state={{ item.userstate | default('present') }} - with_items: '{{ psql_db_data }}' + with_items: '{{ psql_db_data | default(omit) }}' when: item.roles is defined tags: [ 'postgresql', 'postgres', 'pg_db' ] @@ -11,7 +11,7 @@ become: True become_user: postgres postgresql_db: db={{ item.name }} port={{ psql_db_port }} encoding={{ item.encoding }} owner={{ item.user }} template=template0 state={{ item.state | default('present') }} - with_items: '{{ psql_db_data }}' + with_items: '{{ psql_db_data | default(omit) }}' when: item.managedb tags: [ 'postgresql', 'postgres', 'pg_db' ] @@ -19,7 +19,7 @@ become: True become_user: postgres postgresql_user: user={{ item.user }} password={{ item.pwd }} port={{ psql_db_port }} - with_items: '{{ psql_db_data }}' + with_items: '{{ psql_db_data | default(omit) }}' when: - item.pwd is defined - item.roles is not defined