From f546144c57094e0e96eb7e841f5cad48b37d6760 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 27 Oct 2019 16:56:16 +0100 Subject: [PATCH] add loop control and remove no_log --- defaults/main.yml | 2 -- molecule/default/playbook.yml | 1 - tasks/config.yml | 3 ++- tasks/post_tasks.yml | 6 ++++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7bc5930..2ad9770 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -91,5 +91,3 @@ postgres_hba_entries: auth_method: md5 postgres_hba_entries_extra: [] - -postgres_no_log: True diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index 8a70980..376d574 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -10,7 +10,6 @@ db: "demo" postgres_dbs: - name: demo - postgres_no_log: False roles: - role: xoxys.postgres diff --git a/tasks/config.yml b/tasks/config.yml index 81dc979..245961f 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -13,7 +13,8 @@ password: "{{ item.password | password_hash('sha512', 65534 | random(seed=inventory_hostname) | string) }}" state: "{{ item.state | default('present') }}" loop: "{{ postgres_users }}" - no_log: "{{ postgres_no_log }}" + loop_control: + label: "{{ item.name }}" when: item.pam_user | default(False) - name: Setup client authentication diff --git a/tasks/post_tasks.yml b/tasks/post_tasks.yml index b51e50a..a3bfc7d 100644 --- a/tasks/post_tasks.yml +++ b/tasks/post_tasks.yml @@ -16,8 +16,9 @@ port: "{{ item.port | default(omit) }}" owner: "{{ item.owner | default(omit) }}" state: "{{ item.state | default('present') }}" - no_log: "{{ postgres_no_log }}" loop: "{{ postgres_dbs + postgres_dbs_extra }}" + loop_control: + label: "{{ item.name }}" become: True become_user: "{{ postgres_user }}" @@ -35,8 +36,9 @@ login_unix_socket: "{{ item.login_unix_socket | default(postgres_socket_directories[0]) }}" port: "{{ item.port | default(omit) }}" state: "{{ item.state | default('present') }}" - no_log: "{{ postgres_no_log }}" loop: "{{ postgres_users + postgres_users_extra }}" + loop_control: + label: "{{ item.name }}" become: True become_user: "{{ postgres_user }}"