From 92ccc0a73782be97f8b39032fd8763cb0a092009 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:42:23 -0400 Subject: [PATCH] Use consistent naming in patroni.yml --- roles/pvc/templates/patroni/patroni.yml.j2 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/pvc/templates/patroni/patroni.yml.j2 b/roles/pvc/templates/patroni/patroni.yml.j2 index 12d7b60..67e7e91 100644 --- a/roles/pvc/templates/patroni/patroni.yml.j2 +++ b/roles/pvc/templates/patroni/patroni.yml.j2 @@ -4,10 +4,10 @@ name: {{ ansible_hostname }} restapi: listen: '0.0.0.0:8008' - connect_address: '{{ ansible_hostname }}.{{ pvc_cluster_domain }}:8008' + connect_address: {% for node in pvc_nodes if node.hostname == inventory_hostname %}'{{ node.hostname.split('.')[0] }}.{{ pvc_cluster_domain }}:8008'{% endfor %} zookeeper: - hosts: [ {% for node in pvc_nodes if node.is_coordinator %}"{{ node.hostname }}.{{ pvc_cluster_domain }}:2181",{% endfor %} ] + hosts: [ {% for node in pvc_nodes if node.is_coordinator %}"{{ node.hostname.split('.')[0] }}.{{ pvc_cluster_domain }}:2181"{% if not loop.last %},{% endif %}{% endfor %} ] bootstrap: dcs: @@ -29,8 +29,8 @@ bootstrap: pg_hba: - local all all peer - host replication replicator 127.0.0.1/32 trust -{% for host in groups[hostvars[inventory_hostname].group_names[0]] %} - - host replication replicator {{ host }}.{{ pvc_cluster_domain }} trust +{% for node in pvc_nodes if node.is_coordinator %} + - host replication replicator {{ node.hostname.split('.')[0] }}.{{ pvc_cluster_domain }} trust {% endfor %} - host all all 0.0.0.0/0 md5 @@ -43,7 +43,8 @@ bootstrap: postgresql: listen: '0.0.0.0:5432' - connect_address: '{{ ansible_hostname }}.{{ pvc_cluster_domain }}:5432' + connect_address: {% for node in pvc_nodes if node.hostname == inventory_hostname %}'{{ node.hostname.split('.')[0] }}.{{ pvc_cluster_domain }}:5432' +{% endfor %} log_destination: 'stderr' log_min_messages: INFO custom_conf: /etc/postgresql/postgresql.pvc.conf