From fd3dbc30849c6bae1c844d389d7ae72eb47945ef Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Fri, 6 Nov 2020 19:17:19 +0100
Subject: [PATCH] Dependency and variables to support an external db.

---
 defaults/main.yml | 10 ++++++++--
 meta/main.yml     |  7 ++++++-
 vars/main.yml     |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ee277f8..9889c74 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,11 +12,17 @@ open_asfa_behind_haproxy: True
 open_asfa_haproxy_public_net: 'haproxy-public'
 # DB
 open_asfa_db_as_container: True
-open_asfa_db_image: 'postgres:12-alpine'
+open_asfa_db_pg_version: 12
+open_asfa_db_image: 'postgres:{{ open_asfa_db_pg_version }}-alpine'
 open_asfa_db_host: 'pg'
 open_asfa_db_port: 5432
 #open_asfa_db_pwd: 'set it in a vault file'
 open_asfa_db_name: 'asfadb'
 open_asfa_db_user: 'asfadb_user'
 open_asfa_db_volume: 'asfa_pg_data'
-open_asfa_db_constraints: '[node.labels.pg_data==asfa_server]'
\ No newline at end of file
+open_asfa_db_allowed_hosts:
+  - '127.0.0.1/8'
+open_asfa_db_constraints: '[node.labels.pg_data==asfa_server]'
+
+open_asfa_psql_db_data: 
+  - { db_host: '{{ open_asfa_db_host }}', pgsql_version: '{{ open_asfa_db_pg_version }}', name: '{{ open_asfa_db_name }}', encoding: 'UTF8', user: '{{ open_asfa_db_user }}', roles: 'CREATEDB,NOSUPERUSER', pwd: '{{ open_asfa_db_pwd }}', allowed_hosts: '{{ open_asfa_db_allowed_hosts }}' }
diff --git a/meta/main.yml b/meta/main.yml
index 76ff695..4efafcf 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,4 +23,9 @@ galaxy_info:
   galaxy_tags:
     - open-asfa
 
-dependencies: []
+dependencies: 
+  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-pgsql-db-management.git
+    version: master
+    name: pgsql-db-management
+    state: latest
+    when: not open_asfa_db_as_container
diff --git a/vars/main.yml b/vars/main.yml
index 3808477..0b5a7da 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-role-template
\ No newline at end of file
+psql_db_data: '{{ open_asfa_psql_db_data }}'