minor

neuroforgede · Jun 1, 2021 · 500ec7e · 500ec7e
1 parent a74651d
commit 500ec7e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/postgres_cluster_pgbouncer.yml b/postgres_cluster_pgbouncer.yml
@@ -9,4 +9,6 @@
     - name: postgres-cluster-load-vars
     - role: postgres-cluster-hba-config
     - role: postgres-cluster-pgbouncer-setup
+      when: postgresql_cluster_pg_bouncer_include | default('False') | bool
     - role: postgres-cluster-pgbouncer-client-setup
+      when: postgresql_cluster_pg_bouncer_include | default('False') | bool
diff --git a/postgres_cluster_servers.yml b/postgres_cluster_servers.yml
@@ -61,5 +61,7 @@
     - role: postgres-cluster-hba-config
     # setup relevant extra services running on the db servers, namely pgbouncer and xinetd for healtchecks
     - role: postgres-cluster-pgbouncer-setup
+      when: postgresql_cluster_pg_bouncer_include | default('False') | bool
     - role: postgres-cluster-pgbouncer-client-setup
+      when: postgresql_cluster_pg_bouncer_include | default('False') | bool
     - role: postgres-cluster-xinetd
diff --git a/test/simple/inventory_12/group_vars/all/test_all.yml b/test/simple/inventory_12/group_vars/all/test_all.yml
@@ -25,6 +25,7 @@ postgresql_cluster_formation: "default" # FIXME: should be work with non default
 
 postgresql_cluster_pg_bouncer_client_tls_sslmode: "require"
 postgresql_cluster_pg_bouncer_root_password: "pgbouncerpassword"
+postgresql_cluster_pg_bouncer_include: True
 
 postgresql_cluster_hba_entries:
   - { type: hostssl, database: "testdb", address: "10.0.0.0/24", user: "testuser", auth_method: md5, auth_options: "clientcert=0" }

diff --git a/test/simple/inventory_12_1.5/group_vars/all/test_all.yml b/test/simple/inventory_12_1.5/group_vars/all/test_all.yml
@@ -26,6 +26,7 @@ postgresql_pg_auto_failover_version: "1.5"
 
 postgresql_cluster_pg_bouncer_client_tls_sslmode: "require"
 postgresql_cluster_pg_bouncer_root_password: "pgbouncerpassword"
+postgresql_cluster_pg_bouncer_include: True
 
 postgresql_cluster_hba_entries:
   - { type: hostssl, database: "testdb", address: "10.0.0.0/24", user: "testuser", auth_method: md5, auth_options: "clientcert=0" }

diff --git a/test/simple/inventory_13/group_vars/all/test_all.yml b/test/simple/inventory_13/group_vars/all/test_all.yml
@@ -25,6 +25,7 @@ postgresql_cluster_formation: "default" # FIXME: should be work with non default
 
 postgresql_cluster_pg_bouncer_client_tls_sslmode: "require"
 postgresql_cluster_pg_bouncer_root_password: "pgbouncerpassword"
+postgresql_cluster_pg_bouncer_include: True
 
 postgresql_cluster_hba_entries:
   - { type: hostssl, database: "testdb", address: "10.0.0.0/24", user: "testuser", auth_method: md5, auth_options: "clientcert=0" }