Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(postgresql_client_access): use correct order for deprovisioning #237

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/postgresql_client_access/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ postgresql_config_path: "{{ postgresql_base_path }}/config"
postgresql_connect_socket: true

postgresql_container_name: "postgresql"
postgresql_client_state: present
postgresql_client_access_state: "present"
54 changes: 46 additions & 8 deletions roles/postgresql_client_access/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,39 @@
register: "postgresql_container"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Ensure users are either present or absent"
- name: "Ensure users are present"
community.postgresql.postgresql_user:
name: "{{ item.name }}"
password: "{{ (item.state | default(postgresql_client_state) == 'present') | ternary(item.password, omit) }}"
state: "{{ item.state | default(postgresql_client_state) }}"
password: "{{ item.password }}"
state: "present"
login_host: "{{ postgresql_connection.login_host }}"
login_port: "{{ postgresql_connection.login_port }}"
login_password: "{{ postgresql_connection.login_password | default(omit) }}"
loop: "{{ postgresql_client_access_users }}"
loop_control:
label: "{{ item.name }} ({{ item.state | default(postgresql_client_state) }})"
label: "{{ item.name }}"
vars:
item_state: "{{ item.state | default(postgresql_client_access_state) }}"
when: "item_state == 'present'"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Ensure databases are either present or absent"
- name: "Ensure databases are present"
community.postgresql.postgresql_db:
name: "{{ item.name }}"
owner: "{{ item.owner | default(omit) }}"
lc_collate: "{{ item.lc_collate | default('C') }}"
lc_ctype: "{{ item.lc_ctype | default('C') }}"
template: "{{ item.template | default('template0') }}"
state: "{{ item.state | default(postgresql_client_state) }}"
state: "present"
login_host: "{{ postgresql_connection.login_host }}"
login_port: "{{ postgresql_connection.login_port }}"
login_password: "{{ postgresql_connection.login_password | default(omit) }}"
loop: "{{ postgresql_client_access_databases }}"
loop_control:
label: "{{ item.name }} ({{ item.state | default(postgresql_client_state) }})"
label: "{{ item.name }}"
vars:
item_state: "{{ item.state | default(postgresql_client_access_state) }}"
when: "item_state == 'present'"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Ensure pg_hba.conf is up to date"
Expand All @@ -44,10 +50,42 @@
options: "{{ item.options | default(omit) }}"
address: "{{ item.address | default(omit) }}"
netmask: "{{ item.netmask | default(omit) }}"
state: "{{ item.state | default(postgresql_client_state) }}"
state: "{{ item_state }}"
loop: "{{ postgresql_client_access_hba_entries }}"
vars:
item_state: "{{ item.state | default(postgresql_client_access_state) }}"
notify: "postgresql_container_restart"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Ensure databases are absent"
community.postgresql.postgresql_db:
name: "{{ item.name }}"
state: "absent"
login_host: "{{ postgresql_connection.login_host }}"
login_port: "{{ postgresql_connection.login_port }}"
login_password: "{{ postgresql_connection.login_password | default(omit) }}"
loop: "{{ postgresql_client_access_databases }}"
loop_control:
label: "{{ item.name }}"
vars:
item_state: "{{ item.state | default(postgresql_client_access_state) }}"
when: "item_state == 'absent'"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Ensure users are absent"
community.postgresql.postgresql_user:
name: "{{ item.name }}"
state: "absent"
login_host: "{{ postgresql_connection.login_host }}"
login_port: "{{ postgresql_connection.login_port }}"
login_password: "{{ postgresql_connection.login_password | default(omit) }}"
loop: "{{ postgresql_client_access_users }}"
loop_control:
label: "{{ item.name }}"
vars:
item_state: "{{ item.state | default(postgresql_client_access_state) }}"
when: "item_state == 'absent'"
tags: ["deploy", "deploy-postgresql-client-access"]

- name: "Flush handlers to ensure pg_hba updates are propagated in time"
ansible.builtin.meta: "flush_handlers"
Loading