Skip to content

Commit 7d29bf8

Browse files
author
Alan Christie
committed
fix: Can now set postgres login user
1 parent 130323f commit 7d29bf8

File tree

6 files changed

+16
-0
lines changed

6 files changed

+16
-0
lines changed

roles/k8s_database_dump/defaults/main.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ kdd_db_local_port: "5432"
3333
# The file uses the database name with a .sql.gz extension.
3434
kdd_db_dump_directory: /tmp
3535

36+
# The DB admin user
37+
kdd_db_admin_user: postgres
38+
3639
# Maximum length of time to allow an asynchronous kubectl to run.
3740
# kubectl is run asynchronously and then killed by playbooks and roles.
3841
# The timeout is simply a protection mechanism.

roles/k8s_database_dump/tasks/check-pg-dump.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- name: Collect database info
4646
community.postgresql.postgresql_info:
4747
login_host: "127.0.0.1"
48+
login_user: "{{ kdd_db_admin_user }}"
4849
register: postgresql_info
4950

5051
- name: Display database version

roles/k8s_database_dump/tasks/dump-database.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
filter:
77
- databases
88
login_host: "127.0.0.1"
9+
login_user: "{{ kdd_db_admin_user }}"
910
register: postgresql_info
1011
when: not ansible_check_mode
1112

@@ -47,6 +48,7 @@
4748
community.postgresql.postgresql_info:
4849
db: "{{ kdd_db_database }}"
4950
login_host: "127.0.0.1"
51+
login_user: "{{ kdd_db_admin_user }}"
5052
register: postgresql_info
5153

5254
- name: Display database owner
@@ -65,6 +67,7 @@
6567
state: dump
6668
target: "{{ dump_file }}"
6769
login_host: "127.0.0.1"
70+
login_user: "{{ kdd_db_admin_user }}"
6871
dump_extra_args: "{{ kdd_db_dump_extra_args }}"
6972
register: k8s_database_dump_dump_result
7073

roles/k8s_database_restore/defaults/main.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ kdr_db_local_port: "5432"
2727
# The file uses the database name with a .sql.gz extension.
2828
kdr_db_restore_directory: /tmp
2929

30+
# The DB admin user
31+
kdr_db_admin_user: postgres
32+
3033
# Maximum length of time to allow an asynchronous kubectl to run.
3134
# kubectl is run asynchronously and then killed by playbooks and roles.
3235
# The timeout is simply a protection mechanism.

roles/k8s_database_restore/tasks/check-pg-restore.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- name: Collect database info
4646
community.postgresql.postgresql_info:
4747
login_host: "127.0.0.1"
48+
login_user: "{{ kdr_db_admin_user }}"
4849
register: postgresql_info
4950

5051
- name: Display database version

roles/k8s_database_restore/tasks/restore-database.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
community.postgresql.postgresql_db:
77
name: "{{ kdr_db_database }}"
88
login_host: "127.0.0.1"
9+
login_user: "{{ kdr_db_admin_user }}"
910
when: not ansible_check_mode
1011

1112
- name: Create User
@@ -17,6 +18,7 @@
1718
name: "{{ kdr_db_user }}"
1819
password: "{{ kdr_db_user_password }}"
1920
login_host: "127.0.0.1"
21+
login_user: "{{ kdr_db_admin_user }}"
2022

2123
- name: Grant user ALL privileges to {{ kdr_db_database }}
2224
community.postgresql.postgresql_privs:
@@ -26,6 +28,7 @@
2628
obj: "{{ kdr_db_database }}"
2729
role: "{{ kdr_db_user }}"
2830
login_host: "127.0.0.1"
31+
login_user: "{{ kdr_db_admin_user }}"
2932

3033
- name: Set database owner to {{ kdr_db_user }}
3134
community.postgresql.postgresql_owner:
@@ -34,11 +37,13 @@
3437
obj_type: database
3538
new_owner: "{{ kdr_db_user }}"
3639
login_host: "127.0.0.1"
40+
login_user: "{{ kdr_db_admin_user }}"
3741

3842
- name: Restoring database from {{ restore_file }}
3943
community.postgresql.postgresql_db:
4044
name: "{{ kdr_db_database }}"
4145
state: restore
4246
target: "{{ restore_file }}"
4347
login_host: "127.0.0.1"
48+
login_user: "{{ kdr_db_admin_user }}"
4449
when: not ansible_check_mode

0 commit comments

Comments
 (0)