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

ITOPSENG-277 have the schema fixes applied against atl_db_root_db_name

Browse Source
This commit is contained in:
Brett Meehan
2019-12-10 11:20:25 +11:00
parent dff012fc8d
commit cf183913ba
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/aws_node_local.yml
View File

@@ -66,6 +66,7 @@ atl_aws_enable_cloudwatch_logs: "{{ lookup('env', 'ATL_AWS_ENABLE_CLOUDWATCH_LOG
atl_db_engine: "{{ lookup('env', 'ATL_DB_ENGINE') }}" atl_db_engine: "{{ lookup('env', 'ATL_DB_ENGINE') }}"
atl_db_host: "{{ lookup('env', 'ATL_DB_HOST') }}" atl_db_host: "{{ lookup('env', 'ATL_DB_HOST') }}"
atl_db_port: "{{ lookup('env', 'ATL_DB_PORT') or '5432' }}" atl_db_port: "{{ lookup('env', 'ATL_DB_PORT') or '5432' }}"
atl_db_root_db_name: "{{ lookup('env', 'ATL_DB_ROOT_DB_NAME') or 'postgres' }}"
atl_db_root_user: "{{ lookup('env', 'ATL_DB_ROOT_USER') or 'postgres' }}" atl_db_root_user: "{{ lookup('env', 'ATL_DB_ROOT_USER') or 'postgres' }}"
atl_db_root_password: "{{ lookup('env', 'ATL_DB_ROOT_PASSWORD') }}" atl_db_root_password: "{{ lookup('env', 'ATL_DB_ROOT_PASSWORD') }}"
atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}" atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}"

1
roles/database_init/defaults/main.yml
View File

@@ -1,6 +1,7 @@
--- ---
atl_db_port: '5432' atl_db_port: '5432'
atl_db_root_db_name: 'postgres'
atl_db_root_user: 'postgres' atl_db_root_user: 'postgres'
atl_jdbc_encoding: 'UTF-8' atl_jdbc_encoding: 'UTF-8'
atl_jdbc_collation: 'C' atl_jdbc_collation: 'C'

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

@@ -15,7 +15,7 @@
login_host: "{{ atl_db_host }}" login_host: "{{ atl_db_host }}"
login_user: "{{ atl_db_root_user }}" login_user: "{{ atl_db_root_user }}"
login_password: "{{ atl_db_root_password }}" login_password: "{{ atl_db_root_password }}"
db: "{{ atl_jdbc_db_name }}" db: "{{ atl_db_root_db_name }}"
query: "ALTER SCHEMA public OWNER to {{ atl_db_root_user }};" query: "ALTER SCHEMA public OWNER to {{ atl_db_root_user }};"
- name: Grant privs to root user on public schema - name: Grant privs to root user on public schema
@@ -23,7 +23,7 @@
login_host: "{{ atl_db_host }}" login_host: "{{ atl_db_host }}"
login_user: "{{ atl_db_root_user }}" login_user: "{{ atl_db_root_user }}"
login_password: "{{ atl_db_root_password }}" login_password: "{{ atl_db_root_password }}"
db: "{{ atl_jdbc_db_name }}" db: "{{ atl_db_root_db_name }}"
query: "GRANT ALL ON SCHEMA public TO {{ atl_db_root_user }};" query: "GRANT ALL ON SCHEMA public TO {{ atl_db_root_user }};"
- name: Grant privs to application user on public schema - name: Grant privs to application user on public schema
@@ -31,7 +31,7 @@
login_host: "{{ atl_db_host }}" login_host: "{{ atl_db_host }}"
login_user: "{{ atl_db_root_user }}" login_user: "{{ atl_db_root_user }}"
login_password: "{{ atl_db_root_password }}" login_password: "{{ atl_db_root_password }}"
db: "{{ atl_jdbc_db_name }}" db: "{{ atl_db_root_db_name }}"
query: "GRANT ALL ON SCHEMA public TO {{ atl_jdbc_user }};" query: "GRANT ALL ON SCHEMA public TO {{ atl_jdbc_user }};"
- block: - block: