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

changes

Browse Source
This commit is contained in:
Andy Rajagopalan
2020-08-12 16:48:05 -07:00
parent 83ab6009c8
commit 91cb25e9bf
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
group_vars/aws_node_local.yml
View File

@@ -103,7 +103,8 @@ atl_db_type: "{{ atl_db_engine_to_db_type_map[atl_db_engine] | default('postgres
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_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}"
atl_jdbc_password_secret: "{{ lookup ('env', 'ATL_DB_JDBC_PASSWORD_SECRET_NAME') }}"
atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}"
atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US.UTF-8' }}"
atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US.UTF-8' }}"

2
roles/confluence_config/templates/confluence.cfg.xml.j2
View File

@@ -16,7 +16,7 @@
<property name="hibernate.connection.driver_class">{{ atl_db_driver }}</property>
<property name="hibernate.connection.url">{{ atl_jdbc_url }}</property>
<property name="hibernate.connection.username">{{ atl_jdbc_user }}</property>
<property name="hibernate.connection.password">{{ atl_jdbc_password | replace("&", "&amp;") }}</property>
<property name="hibernate.connection.password">{{ (lookup('aws_secret',atl_jdbc_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}</property>
<property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
<property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
<property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>

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

@@ -11,7 +11,7 @@
login_password: "{{ (lookup('aws_secret',atl_db_root_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}"
port: "{{ atl_db_port }}"
name: "{{ atl_jdbc_user }}"
password: "{{ atl_jdbc_password }}"
password: "{{ (lookup('aws_secret',atl_jdbc_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}"
expires: 'infinity'
- name: Collect dbcluster db_names