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

Ensure postgresql service is started after configuration even with no configuration change #24

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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Debian 12 | Yes | Yes | Yes | Yes | Yes
Ubuntu 20.04 | Yes | Yes | Yes | Yes | Yes
Ubuntu 22.04 | Yes | Yes | Yes | Yes | Yes
Ubuntu 24.04 | Yes | Yes | Yes | Yes | Yes
RockyLinux 8.7 | Yes | Yes | Yes | Yes | Yes
RockyLinux 9.1 | Yes | Yes | Yes | Yes | Yes
RockyLinux 8.9 | Yes | Yes | Yes | Yes | Yes
RockyLinux 9.3 | Yes | Yes | Yes | Yes | Yes
Fedora 38 | No | No | No | No | No

## Role features in use
Expand Down Expand Up @@ -607,7 +607,7 @@ If you want to uninstall a Postgresql installation with this role, set both vari
postgresql_autotune: true
# postgresql_autotune_base_url: http://192.168.56.101:3000

postgres_users_no_log: false
postgresql_users_no_log: false
postgresql_users:
# Create two groups 'group1' and 'group2' by making use of thr role_attr_flags attribute
- name: group1
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ postgresql_users: []
# port: # defaults to not set
# state: # defaults to 'present'
# Whether to output user data when managing users.
postgres_users_no_log: true
postgresql_users_no_log: true

# Manage group/role memberships
postgresql_memberships: []
Expand Down
2 changes: 1 addition & 1 deletion molecule/shared/vars/main_all_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ postgresql_hba_entries_extra: []
postgresql_autotune: true
# postgresql_autotune_base_url: http://192.168.56.101:3000

postgres_users_no_log: false
postgresql_users_no_log: false
postgresql_users:
# Create two groups 'group1' and 'group2' by making use of thr role_attr_flags attribute
- name: group1
Expand Down
3 changes: 2 additions & 1 deletion tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@
mode: "{{ postgresql_tempfile_mode }}"
when: postgresql_persist_permissions

- name: Set postgresql service enabled state
- name: Set postgresql service enabled and started state
ansible.builtin.service:
name: "{{ _postgresql_daemon }}"
enabled: "{{ postgresql_service_enabled }}"
state: "{{ _postgresql_service_state | d(omit, true) }}"

- name: Ensure postgresql service is running with latest up to date configuration
ansible.builtin.meta: flush_handlers
Expand Down
4 changes: 2 additions & 2 deletions tasks/databases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_schemas }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand Down Expand Up @@ -76,7 +76,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_tables }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand Down
4 changes: 2 additions & 2 deletions tasks/ownerships.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_ownerships }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand Down Expand Up @@ -43,7 +43,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_privs }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand Down
2 changes: 1 addition & 1 deletion tasks/redhat/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
environment: "{{ _postgresql_pkg_proxy_env }}"

# prereqs to install psycopg2
- name: Install gcc rockylinux
- name: Install gcc
ansible.builtin.dnf:
name: gcc
state: present
Expand Down
2 changes: 1 addition & 1 deletion tasks/replication-primary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
expires: infinity
role_attr_flags: REPLICATION
state: present
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
# See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
Expand Down
4 changes: 2 additions & 2 deletions tasks/sql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_queries }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand All @@ -40,7 +40,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_scripts }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
changed_when: false
become: true
become_user: "{{ postgresql_user }}"
Expand Down
2 changes: 1 addition & 1 deletion tasks/tablespaces.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
when: not postgresql_replication or postgresql_replication_role == "primary"
become: true
become_user: "{{ postgresql_user }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
vars:
ansible_ssh_pipelining: true
ansible_python_interpreter: "{{ _postgresql_ansible_python_interpreter }}"
Expand Down
4 changes: 2 additions & 2 deletions tasks/users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
loop: "{{ postgresql_users }}"
loop_control:
label: "{{ item.name }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
environment:
Expand All @@ -47,7 +47,7 @@
session_role: "{{ item.session_role | d(omit) }}"
trust_input: "{{ item.trust_input | d(omit) }}"
loop: "{{ postgresql_memberships }}"
no_log: "{{ postgres_users_no_log }}"
no_log: "{{ postgresql_users_no_log }}"
become: true
become_user: "{{ postgresql_user }}"
vars:
Expand Down
2 changes: 2 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ _postgresql_general_proxy_env: {}
_postgresql_pkg_proxy_env: {}
# How to handle configuration changes
_postgresql_config_change_handler_state: reloaded
# Default service state after configuration regardless of configuration changes
_postgresql_service_state: started

_postgresql_apt_mirror_url: http://apt.postgresql.org/pub/repos/apt
_postgresql_repo_rpm_url: "https://download.postgresql.org/pub/repos/yum/reporpms/{{ (ansible_distro == 'fedora') | ternary('F', 'EL') }}-{{ ansible_distribution_major_version }}-x86_64/pgdg-{{ (ansible_distro == 'fedora') | ternary('fedora', 'redhat') }}-repo-latest.noarch.rpm"
Expand Down
Loading