From da42f60884cf5060383d3f5b25d56d406e5243f8 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rajesh.r@optit.co>
Date: Wed, 22 Nov 2017 16:03:09 +0530
Subject: [PATCH] Issue #338 feat: removing user and DB creation
---
ansible/roles/postgresql/tasks/databases.yml | 21 --------------------
ansible/roles/postgresql/tasks/main.yml | 4 ----
ansible/roles/postgresql/tasks/users.yml | 21 --------------------
3 files changed, 46 deletions(-)
delete mode 100755 ansible/roles/postgresql/tasks/databases.yml
delete mode 100755 ansible/roles/postgresql/tasks/users.yml
diff --git a/ansible/roles/postgresql/tasks/databases.yml b/ansible/roles/postgresql/tasks/databases.yml
deleted file mode 100755
index fa782ea9f..000000000
--- a/ansible/roles/postgresql/tasks/databases.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Ensure PostgreSQL databases are present.
- postgresql_db:
- name: "{{ item.name }}"
- lc_collate: "{{ item.lc_collate | default('en_US.UTF-8') }}"
- lc_ctype: "{{ item.lc_ctype | default('en_US.UTF-8') }}"
- encoding: "{{ item.encoding | default('UTF-8') }}"
- template: "{{ item.template | default('template0') }}"
- login_host: "{{ item.login_host | default('localhost') }}"
- login_password: "{{ item.login_password | default(omit) }}"
- login_user: "{{ item.login_user | default(postgresql_user) }}"
- login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
- port: "{{ item.port | default(omit) }}"
- owner: "{{ item.owner | default(postgresql_user) }}"
- state: "{{ item.state | default('present') }}"
- with_items: "{{ postgresql_databases }}"
- become: yes
- become_user: "{{ postgresql_user }}"
- # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
- vars:
- ansible_ssh_pipelining: true
diff --git a/ansible/roles/postgresql/tasks/main.yml b/ansible/roles/postgresql/tasks/main.yml
index 3e5111478..87a8a0857 100755
--- a/ansible/roles/postgresql/tasks/main.yml
+++ b/ansible/roles/postgresql/tasks/main.yml
@@ -20,7 +20,3 @@
name: "{{ postgresql_daemon }}"
state: started
enabled: yes
-
-# Configure PostgreSQL.
-- include: databases.yml
-- include: users.yml
diff --git a/ansible/roles/postgresql/tasks/users.yml b/ansible/roles/postgresql/tasks/users.yml
deleted file mode 100755
index 33e5ebdbb..000000000
--- a/ansible/roles/postgresql/tasks/users.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Ensure PostgreSQL users are present.
- postgresql_user:
- name: "{{ item.name }}"
- password: "{{ item.password | default(omit) }}"
- priv: "{{ item.priv | default(omit) }}"
- role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
- db: "{{ item.db | default(omit) }}"
- login_host: "{{ item.login_host | default('localhost') }}"
- login_password: "{{ item.login_password | default(omit) }}"
- login_user: "{{ item.login_user | default(postgresql_user) }}"
- login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
- port: "{{ item.port | default(omit) }}"
- state: "{{ item.state | default('present') }}"
- with_items: "{{ postgresql_users }}"
- no_log: true
- become: yes
- become_user: "{{ postgresql_user }}"
- # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
- vars:
- ansible_ssh_pipelining: true
--
GitLab