More configurable parameters

Author: YuryHrytsuk

services/rabbit/docker-compose.yml.j2

@@ -5,17 +5,19 @@ services:
     image: haproxy:3.2
     deploy:
       # https://discourse.haproxy.org/t/haproxy-high-availability-configuration/11983
-      replicas: 2
+      replicas: ${RABBIT_LB_REPLICAS}
       # necessary to preserve client ip
       # otherwise we see overlay network lb ip
       # (rabbitmq management dashboard connection section)
       endpoint_mode: dnsrr
     # healthcheck: https://github.com/haproxy/haproxy/issues/3091
     networks:
       - rabbit
+      - public
     configs:
       - source: haproxy.cfg
         target: /usr/local/etc/haproxy/haproxy.cfg
+
 {% for ix in NODE_IXS %}
   rabbit0{{ ix }}:
     image: itisfoundation/rabbitmq:4.1.2-management
@@ -27,9 +29,11 @@ services:
         constraints:
           - node.labels.rabbit0{{ ix }} == true
     environment:
+      # https://www.rabbitmq.com/docs/configure#supported-environment-variables
       RABBITMQ_DEFAULT_USER: ${RABBIT_USER}
       RABBITMQ_DEFAULT_PASS: ${RABBIT_PASSWORD}
       RABBITMQ_NODENAME: {% raw %}"rabbit@{{.Service.Name}}"{% endraw %}
+      RABBITMQ_NODE_PORT: ${RABBIT_PORT}
     # https://docs.docker.com/reference/compose-file/services/#long-syntax-5
     # https://hub.docker.com/_/rabbitmq#erlang-cookie
     secrets:
@@ -97,21 +101,20 @@ volumes:
 {%- endfor %}
 
 networks:
-  # TODO: consider creating it externally for better control over subnets size and ip ranges
   rabbit:
-    name: ${RABBIT_DOCKER_SWARM_NETWORK_NAME}
-    driver: overlay
-    attachable: true
+    name: ${RABBIT_NETWORK}
+    external: true
 
 configs:
   rabbitmq.conf:
+    # no rolling update since it requires full cluster restart
     file: ./rabbitmq.conf
   haproxy.cfg:
     file: ./haproxy.cfg
     name: ${STACK_NAME}_haproxy_conf_{{ "./haproxy.cfg" | sha256file | substring(0,10) }}
 
 secrets:
   rabbit_erlang_cookie:
-    # TODO: rolling secrets update?
+    # no rolling update since it requires full cluster restart
     name: ${STACK_NAME}_erlang_cookie
     file: ./erlang.cookie.secret

services/rabbit/haproxy.cfg.j2

@@ -1,3 +1,5 @@
+{% set NODE_IXS = range(1, (RABBIT_CLUSTER_NODE_COUNT | int) + 1) -%}
+
 global
     log stdout format raw local0
     maxconn 4096
@@ -29,20 +31,20 @@ defaults
     timeout server 30s
 
 frontend rabbit
-    bind *:5672
+    bind *:{{ RABBIT_PORT }}
     default_backend rabbit_backends
 
 frontend rabbit_dashboard
-    bind *:15672
+    bind *:{{ RABBIT_MANAGEMENT_PORT }}
     default_backend rabbit_dashboard_backends
 
 backend rabbit_backends
     balance roundrobin
 
-    # init-addrs libc,none - start even if there aren’t any running
-    server rabbit01 rabbit_rabbit01:5672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3 send-proxy
-    server rabbit02 rabbit_rabbit02:5672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3 send-proxy
-    server rabbit03 rabbit_rabbit03:5672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3 send-proxy
+    # init-addrs libc,none - start even if there aren’t any backend servers running
+{% for ix in NODE_IXS %}
+    server rabbit0{{ ix }} rabbit_rabbit0{{ ix }}:{{ RABBIT_PORT }} check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3 send-proxy
+{%- endfor %}
 
 backend rabbit_dashboard_backends
     mode http
@@ -52,6 +54,7 @@ backend rabbit_dashboard_backends
     http-request set-header X-Forwarded-Port %[dst_port]
     http-request add-header X-Forwarded-Proto https if { ssl_fc }
 
-    server rabbit01 rabbit_rabbit01:15672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3
-    server rabbit02 rabbit_rabbit02:15672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3
-    server rabbit03 rabbit_rabbit03:15672 check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3
+{% for ix in NODE_IXS %}
+    server rabbit0{{ ix }} rabbit_rabbit0{{ ix }}:{{ RABBIT_MANAGEMENT_PORT }} check resolvers dockerdns init-addr libc,none inter 5s rise 2 fall 3
+{%- endfor %}
+# keep new line in the end to avoid "Missing LF on last line" error

services/rabbit/template.env

@@ -5,6 +5,12 @@ RABBIT_QUORUM_QUEUE_DEFAULT_REPLICA_COUNT=${RABBIT_QUORUM_QUEUE_DEFAULT_REPLICA_
 
 RABBIT_USER=${RABBIT_USER}
 RABBIT_PASSWORD=${RABBIT_PASSWORD}
+RABBIT_PORT=${RABBIT_PORT}
+RABBIT_MANAGEMENT_PORT=${RABBIT_MANAGEMENT_PORT}
+
 RABBIT_ERLANG_COOKIE=${RABBIT_ERLANG_COOKIE}
+RABBIT_LB_REPLICAS=${RABBIT_LB_REPLICAS}
+RABBIT_NETWORK=${RABBIT_NETWORK}
 
-RABBIT_DOCKER_SWARM_NETWORK_NAME=rabbit_rabbit_subnet
+PUBLIC_NETWORK=${PUBLIC_NETWORK}
+MONITORING_DOMAIN=${MONITORING_DOMAIN}