From ade6b02c90dc8e4418b4fa9a29b4a3d361d2ecf0 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 17 Apr 2019 11:37:56 +1000 Subject: [PATCH] DCD-224: Fix DB name var. --- group_vars/all.yml | 4 ++-- roles/database_config/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 385686c..cc7fe82 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -36,14 +36,14 @@ atl_db_minidle: "{{ lookup('env', 'ATL_DB_MINIDLE') or '10' }}" atl_db_maxidle: "{{ lookup('env', 'ATL_DB_MAXIDLE') or '20' }}" atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}" -atl_jdbc_db_name: "{{ lookup('env', 'ATL_DB_NAME') }}" -atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}" +atl_jdbc_db_name: "{{ lookup('env', 'ATL_JDBC_DB_NAME') }}" atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}" atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}" atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}" atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US' }}" atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US' }}" atl_jdbc_template: "{{ lookup('env', 'ATL_JDBC_TEMPLATE') or 'template1' }}" +atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}" atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP) }}" atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS) }}" diff --git a/roles/database_config/tasks/main.yml b/roles/database_config/tasks/main.yml index a4eed20..2a3015b 100644 --- a/roles/database_config/tasks/main.yml +++ b/roles/database_config/tasks/main.yml @@ -17,7 +17,7 @@ login_user: "{{ atl_db_root_user }}" login_password: "{{ atl_db_root_password }}" port: "{{ atl_db_port }}" - name: "{{ atl_jdbc_name }}" + name: "{{ atl_jdbc_db_name }}" owner: "{{ atl_jdbc_user }}" encoding: "{{ atl_jdbc_encoding }}" lc_collate: "{{ atl_jdbc_collation }}"