blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

DCD-224: Fix DB name var.

Browse Source
This commit is contained in:
Steve Smith
2019-04-17 11:37:56 +10:00
parent ef96d81aad
commit ade6b02c90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all.yml
View File

@@ -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_maxidle: "{{ lookup('env', 'ATL_DB_MAXIDLE') or '20' }}"
atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}" atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}"
atl_jdbc_db_name: "{{ lookup('env', 'ATL_DB_NAME') }}" atl_jdbc_db_name: "{{ lookup('env', 'ATL_JDBC_DB_NAME') }}"
atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}"
atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}" atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}"
atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}" atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}"
atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}" atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}"
atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US' }}" atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US' }}"
atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') 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_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_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP) }}"
atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS) }}" atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS) }}"

2
roles/database_config/tasks/main.yml
View File

@@ -17,7 +17,7 @@
login_user: "{{ atl_db_root_user }}" login_user: "{{ atl_db_root_user }}"
login_password: "{{ atl_db_root_password }}" login_password: "{{ atl_db_root_password }}"
port: "{{ atl_db_port }}" port: "{{ atl_db_port }}"
name: "{{ atl_jdbc_name }}" name: "{{ atl_jdbc_db_name }}"
owner: "{{ atl_jdbc_user }}" owner: "{{ atl_jdbc_user }}"
encoding: "{{ atl_jdbc_encoding }}" encoding: "{{ atl_jdbc_encoding }}"
lc_collate: "{{ atl_jdbc_collation }}" lc_collate: "{{ atl_jdbc_collation }}"