Merge branch 'master' into cloud

vitabaks · Dec 18, 2023 · b67570d · b67570d
2 parents bb2252e + 139f567
commit b67570d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/roles/pgbouncer/config/tasks/main.yml b/roles/pgbouncer/config/tasks/main.yml
@@ -69,7 +69,9 @@
       '; done
   args:
     executable: /bin/bash
-  when: pgbouncer_auth_user|bool and is_master|bool
+  when:
+    - pgbouncer_auth_user | bool
+    - (is_master | bool and patroni_standby_cluster.host | default('') | length < 1) # do not perform on the Standby Cluster leader
   tags: pgbouncer, pgbouncer_conf, pgbouncer_auth_query
 
 ...
diff --git a/roles/postgresql-users/tasks/main.yml b/roles/postgresql-users/tasks/main.yml
@@ -19,9 +19,9 @@
   loop_control:
     label: "{{ item.name }}"
   when:
-    - postgresql_users is defined
-    - postgresql_users | length > 0
+    - postgresql_users | default('') | length > 0
     - item.password | default('') | length > 0  # Ensure the password is not empty
+    - patroni_standby_cluster.host | default('') | length < 1  # do not perform on the Standby Cluster leader
   tags: postgresql_users
 
 - name: Grant roles to users
@@ -38,9 +38,9 @@
   loop_control:
     label: "{{ item.name }}"
   when:
-    - postgresql_users is defined
-    - postgresql_users | length > 0
+    - postgresql_users | default('') | length > 0
     - item.role | default('') | length > 0
+    - patroni_standby_cluster.host | default('') | length < 1  # do not perform on the Standby Cluster leader
   tags: postgresql_users
 
 ...