VIP: make the cluster ip address as optional.

Now, you can deploy your custom schemes without using a VIP (cluster IP address) if necessary.
vitabaks · Feb 7, 2020 · 176a36a · 176a36a
1 parent 7079672
commit 176a36a
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -155,10 +155,11 @@ proxy_env:
   http_proxy: http://proxy_server_ip:port
   https_proxy: http://proxy_server_ip:port
 ```
-- `cluster_vip`
+- `cluster_vip` # for client access to databases in the cluster (optional)
 - `patroni_cluster_name`
 - `with_haproxy_load_balancing` `'true'` (Type A) or `'false'`/default (Type B)
 - `postgresql_version`
+- `postgresql_data_dir`
 
 
 5. Run playbook:

diff --git a/add_balancer.yml b/add_balancer.yml
@@ -19,10 +19,10 @@
     - import_tasks: tasks/hostname.yml
       when: hostname is defined and hostname | length > 0
       tags: hostname
-  
+
     - import_tasks: tasks/sysctl.yml
       tags: [ sysctl, kernel ]
-  
+
     - name: Make sure the gnupg package is present
       apt:
         name: gnupg

diff --git a/add_pgnode.yml b/add_pgnode.yml
@@ -75,7 +75,7 @@
       tags: patroni
 
     - import_tasks: tasks/vip-manager.yml
-      when: with_haproxy_load_balancing != "true"
+      when: with_haproxy_load_balancing != "true" and (cluster_vip is defined and cluster_vip | length > 0)
       tags: [ vip, vip_manager ]
 
     # finish (info)

diff --git a/deploy_pgcluster.yml b/deploy_pgcluster.yml
@@ -99,7 +99,7 @@
       tags: [ sysctl, kernel ]
 
     - import_tasks: tasks/haproxy.yml
-      when: with_haproxy_load_balancing == "true" and cluster_vip | length > 0
+      when: with_haproxy_load_balancing == "true"
       tags: load_balancing
 
 
@@ -137,7 +137,7 @@
       tags: patroni
 
     - import_tasks: tasks/vip-manager.yml
-      when: with_haproxy_load_balancing != "true" and cluster_vip | length > 0
+      when: with_haproxy_load_balancing != "true" and (cluster_vip is defined and cluster_vip | length > 0)
       tags: [ vip, vip_manager ]
 
     # optional

diff --git a/tasks/confd.yml b/tasks/confd.yml
@@ -86,8 +86,29 @@
         backrefs: yes
       loop:
        - { regexp: '^.*bind.*:7000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:7000' }
+       - { regexp: '^.*bind.*:5000$', line: '    bind {{ cluster_vip }}:5000' }
+       - { regexp: '^.*bind.*:5001$', line: '    bind {{ cluster_vip }}:5001' }
+       - { regexp: '^.*bind.*:5002$', line: '    bind {{ cluster_vip }}:5002' }
+       - { regexp: '^.*bind.*:5003$', line: '    bind {{ cluster_vip }}:5003' }
       loop_control:
         label: "{{ item.line }}"
+      when: cluster_vip is defined and cluster_vip | length > 0
+
+    - name: confd | prepare haproxy.tmpl template file (replace "bind" for stats)
+      lineinfile:
+        path: /etc/confd/templates/haproxy.tmpl
+        regexp: '{{ item.regexp }}'
+        line: '{{ item.line }}'
+        backrefs: yes
+      loop:
+       - { regexp: '^.*bind.*:7000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:7000' }
+       - { regexp: '^.*bind.*:5000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5000' }
+       - { regexp: '^.*bind.*:5001$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5001' }
+       - { regexp: '^.*bind.*:5002$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5002' }
+       - { regexp: '^.*bind.*:5003$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5003' }
+      loop_control:
+        label: "{{ item.line }}"
+      when: cluster_vip is not defined or cluster_vip | length < 1
   when: add_balancer is defined and add_balancer|bool
   tags: [ confd_conf, confd ]
 

diff --git a/tasks/deploy_finish.yml b/tasks/deploy_finish.yml
@@ -47,11 +47,8 @@
           - port 5002 (read only)  synchronous replica only
           - port 5003 (read only)  asynchronous replicas only
           - +------------------------------------------------+
-  when: with_haproxy_load_balancing == "true" and synchronous_mode == "true"
-  ignore_errors: yes
-  tags: conn_info
+      when: with_haproxy_load_balancing == "true" and synchronous_mode == "true"
 
-- block:
     - name: PostgreSQL Cluster connection info
       run_once: true
       debug:
@@ -61,11 +58,8 @@
           - port 5000 (read/write) master
           - port 5001 (read only)  all replicas
           - +------------------------------------------------+
-  when: with_haproxy_load_balancing == "true" and synchronous_mode != "true"
-  ignore_errors: yes
-  tags: conn_info
+      when: with_haproxy_load_balancing == "true" and synchronous_mode != "true"
 
-- block:
     - name: PostgreSQL Cluster connection info
       run_once: true
       debug:
@@ -74,11 +68,8 @@
           - address (VIP) {{ cluster_vip }}
           - port {{ pgbouncer_listen_port }} (pgbouncer)
           - +------------------------------------------------+
-  when: with_haproxy_load_balancing == "false" and install_pgbouncer == "true"
-  ignore_errors: yes
-  tags: conn_info
+      when: with_haproxy_load_balancing == "false" and install_pgbouncer == "true"
 
-- block:
     - name: PostgreSQL Cluster connection info
       run_once: true
       debug:
@@ -87,7 +78,8 @@
           - address (VIP) {{ cluster_vip }}
           - port {{ postgresql_port }}
           - +------------------------------------------------+
-  when: with_haproxy_load_balancing == "false" and install_pgbouncer != "true"
+      when: with_haproxy_load_balancing == "false" and install_pgbouncer != "true"
+  when: cluster_vip is defined and cluster_vip | length > 0
   ignore_errors: yes
   tags: conn_info
 
@@ -102,4 +94,6 @@
       debug:
         msg: "Cluster ip address (VIP) {{ cluster_vip }} is running on server {{ ansible_hostname }}"
       when: man_ip is defined and man_ip == cluster_vip
+  when: cluster_vip is defined and cluster_vip | length > 0
+  ignore_errors: yes
   tags: [ vip_owner, vip_status ]
diff --git a/tasks/haproxy.yml b/tasks/haproxy.yml
@@ -345,6 +345,22 @@
         group: haproxy
       register: haproxy_conf_result
 
+    - name: haproxy | prepare haproxy.cfg conf file (replace "bind")
+      lineinfile:
+        path: /etc/haproxy/haproxy.cfg
+        regexp: '{{ item.regexp }}'
+        line: '{{ item.line }}'
+        backrefs: yes
+      loop:
+       - { regexp: '^.*bind.*:7000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:7000' }
+       - { regexp: '^.*bind.*:5000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5000' }
+       - { regexp: '^.*bind.*:5001$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5001' }
+       - { regexp: '^.*bind.*:5002$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5002' }
+       - { regexp: '^.*bind.*:5003$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:5003' }
+      loop_control:
+        label: "{{ item.line }}"
+      when: cluster_vip is not defined or cluster_vip | length < 1
+
     - name: haproxy | prepare haproxy.cfg conf file (replace "bind" for stats)
       lineinfile:
         path: /etc/haproxy/haproxy.cfg
@@ -353,9 +369,13 @@
         backrefs: yes
       loop:
        - { regexp: '^.*bind.*:7000$', line: '    bind {{ hostvars[inventory_hostname].inventory_hostname }}:7000' }
+       - { regexp: '^.*bind.*:5000$', line: '    bind {{ cluster_vip }}:5000' }
+       - { regexp: '^.*bind.*:5001$', line: '    bind {{ cluster_vip }}:5001' }
+       - { regexp: '^.*bind.*:5002$', line: '    bind {{ cluster_vip }}:5002' }
+       - { regexp: '^.*bind.*:5003$', line: '    bind {{ cluster_vip }}:5003' }
       loop_control:
         label: "{{ item.line }}"
-      register: haproxy_conf_prepare_result
+      when: cluster_vip is defined and cluster_vip | length > 0
   when: add_balancer is defined and add_balancer|bool
   tags: [ haproxy, haproxy_conf ]
 
@@ -437,4 +457,5 @@
 
   # virtual ip address (and haproxy health checking)
 - import_tasks: ../tasks/keepalived.yml
+  when: cluster_vip is defined and cluster_vip | length > 0
   tags: keepalived
diff --git a/tasks/patroni.yml b/tasks/patroni.yml
@@ -278,6 +278,23 @@
        - { regexp: '^  connect_address: ((?!8008).)*$', line: '  connect_address: {{ hostvars[inventory_hostname].inventory_hostname }}:{{ postgresql_port }}' }
       loop_control:
         label: "{{ item.line }}"
+      when: with_haproxy_load_balancing == "true" or install_pgbouncer == "true" or (cluster_vip is not defined or cluster_vip | length < 1)
+
+    - name: Patroni | prepare patroni.yml conf file (replace "name","listen","connect_address")
+      lineinfile:
+        path: /etc/patroni/patroni.yml
+        regexp: '{{ item.regexp }}'
+        line: '{{ item.line }}'
+        backrefs: yes
+      loop:
+       - { regexp: '^name:', line: 'name: {{ ansible_hostname }}' }
+       - { regexp: '^  listen: .*:8008$', line: '  listen: {{ hostvars[inventory_hostname].inventory_hostname }}:8008' }
+       - { regexp: '^  connect_address: .*:8008$', line: '  connect_address: {{ hostvars[inventory_hostname].inventory_hostname }}:8008' }
+       - { regexp: '^  listen: ((?!8008).)*$', line: '  listen: {{ hostvars[inventory_hostname].inventory_hostname }},{{ cluster_vip }},127.0.0.1:{{ postgresql_port }}' }
+       - { regexp: '^  connect_address: ((?!8008).)*$', line: '  connect_address: {{ hostvars[inventory_hostname].inventory_hostname }}:{{ postgresql_port }}' }
+      loop_control:
+        label: "{{ item.line }}"
+      when: with_haproxy_load_balancing != "true" and install_pgbouncer != "true" and (cluster_vip is defined and cluster_vip | length > 0)
   when: existing_pgcluster is defined and existing_pgcluster|bool
   tags: [ patroni, patroni_conf ]
 

diff --git a/tasks/pgbouncer.yml b/tasks/pgbouncer.yml
@@ -111,6 +111,19 @@
        - { regexp: '^listen_addr =', line: 'listen_addr = {{ hostvars[inventory_hostname].inventory_hostname }}' }
       loop_control:
         label: "{{ item.line }}"
+      when: with_haproxy_load_balancing == 'true' or (cluster_vip is not defined or cluster_vip | length < 1)
+
+    - name: PgBouncer | prepare pgbouncer.ini conf file (replace "listen_addr")
+      lineinfile:
+        path: /etc/pgbouncer/pgbouncer.ini
+        regexp: '{{ item.regexp }}'
+        line: '{{ item.line }}'
+        backrefs: yes
+      loop:
+       - { regexp: '^listen_addr =', line: 'listen_addr = {{ hostvars[inventory_hostname].inventory_hostname }},{{ cluster_vip }}' }
+      loop_control:
+        label: "{{ item.line }}"
+      when: with_haproxy_load_balancing != 'true' and (cluster_vip is defined and cluster_vip | length > 0 )
   when: existing_pgcluster is defined and existing_pgcluster|bool
   tags: [ pgbouncer_conf, pgbouncer ]
 

diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2
@@ -26,7 +26,11 @@ listen stats
     stats uri /
 
 listen master
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5000
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5000
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /master
@@ -44,7 +48,11 @@ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['inventory_hos
 {% endif %}
 
 listen replicas
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5001
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5001
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /replica
@@ -63,7 +71,11 @@ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['inventory_hos
 {% endif %}
 
 listen replicas_sync
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5002
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5002
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /sync
@@ -82,7 +94,11 @@ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['inventory_hos
 {% endif %}
 
 listen replicas_async
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5003
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5003
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /async

diff --git a/templates/haproxy.tmpl.j2 b/templates/haproxy.tmpl.j2
@@ -26,7 +26,11 @@ listen stats
     stats uri /
 
 listen master
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5000
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5000
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /master
@@ -43,7 +47,11 @@ listen master
 
 
 listen replicas
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5001
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5001
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /replica
@@ -61,7 +69,11 @@ listen replicas
 
 
 listen replicas_sync
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5002
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5002
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /sync
@@ -79,7 +91,11 @@ listen replicas_sync
 
 
 listen replicas_async
+{% if cluster_vip is defined and cluster_vip | length > 0 %}
     bind {{ cluster_vip }}:5003
+{% else %}
+    bind {{ hostvars[inventory_hostname]['inventory_hostname'] }}:5003
+{% endif %}
     maxconn 10000
     option tcplog
     option httpchk OPTIONS /async

diff --git a/templates/patroni.yml.j2 b/templates/patroni.yml.j2
@@ -81,11 +81,10 @@ bootstrap:
 
 
 postgresql:
-{% if with_haproxy_load_balancing == "true" or install_pgbouncer == "true" %}
-  listen: {{ hostvars[inventory_hostname]['inventory_hostname'] }},127.0.0.1:{{ postgresql_port }}
-{% endif %}
-{% if with_haproxy_load_balancing != "true" and install_pgbouncer != "true" %}
+{% if with_haproxy_load_balancing != "true" and install_pgbouncer != "true" and (cluster_vip is defined and cluster_vip | length > 0) %}
   listen: {{ hostvars[inventory_hostname]['inventory_hostname'] }},{{ cluster_vip }},127.0.0.1:{{ postgresql_port }}
+{% else %}
+  listen: {{ hostvars[inventory_hostname]['inventory_hostname'] }},127.0.0.1:{{ postgresql_port }}
 {% endif %}
   connect_address: {{ hostvars[inventory_hostname]['inventory_hostname'] }}:{{ postgresql_port }}
   use_unix_socket: true

diff --git a/templates/pgbouncer.ini.j2 b/templates/pgbouncer.ini.j2
@@ -8,11 +8,10 @@
 [pgbouncer]
 logfile = {{ pgbouncer_log_dir }}/pgbouncer.log
 pidfile = /var/run/pgbouncer/pgbouncer.pid
-{% if with_haproxy_load_balancing == 'true' %}
-listen_addr = {{ hostvars[inventory_hostname]['inventory_hostname'] }}
-{% endif %}
-{% if with_haproxy_load_balancing != 'true' %}
+{% if with_haproxy_load_balancing != 'true' and cluster_vip is defined and cluster_vip | length > 0 %}
 listen_addr = {{ hostvars[inventory_hostname]['inventory_hostname'] }},{{ cluster_vip }}
+{% else %}
+listen_addr = {{ hostvars[inventory_hostname]['inventory_hostname'] }}
 {% endif %}
 listen_port = {{ pgbouncer_listen_port | default(6432) }}
 unix_socket_dir = /var/run/postgresql

diff --git a/vars/main.yml b/vars/main.yml
@@ -7,7 +7,7 @@ proxy_env: {}
 # -------------------------------------------
 
 # Cluster variables
-cluster_vip: "10.128.64.145" # for client access to databases in the cluster
+cluster_vip: "10.128.64.145" # for client access to databases in the cluster (optional)
 vip_interface: "{{ ansible_default_ipv4.interface }}" # interface name (ex. "ens32")
 
 patroni_cluster_name: "postgres-cluster"  # specify the cluster name