From 5d2e9f2e70ecec5c0d1b4d52ecba9b3b7b83b59c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Sat, 23 Jul 2022 13:00:16 +0200
Subject: [PATCH] Update to 2022-07-23 13:00

---
 roles/consul/defaults/main.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml
index 10b2c84..fe307e8 100644
--- a/roles/consul/defaults/main.yml
+++ b/roles/consul/defaults/main.yml
@@ -18,39 +18,41 @@ consul_servers: []
 
 # List of services exposed by consul, the ports they use, and the list of IP
 # for which the service is accessible at the firewall level (if iptables_manage == True)
-consul_services:
+consul_base_services:
   dns:
-    port: 8600
+    port: "{{ consul_conf.ports.dns | default(8600) }}"
     src_ip: []
     proto: [tcp,udp]
-  http_api:
-    port: 8500
+  http:
+    port: "{{ consul_conf.ports.http | default(8500) }}"
     src_ip: []
     proto: [tcp]
-  https_api:
-    port: 8501
+  https:
+    port: "{{ consul_conf.ports.https | default(8501) }}"
     src_ip: []
     proto: [tcp]
-  grpc_api:
-    port: 8502
+  grpc:
+    port: "{{ consul_conf.ports.groc | default(8502) }}"
     src_ip: []
     proto: [tcp]
-  lan_serf:
-    port: 8301
+  serf_lan:
+    port: "{{ consul_conf.ports.serf_lan | default(8301) }}"
     src_ip: []
     proto: [tcp,udp]
-  wan_serf:
-    port: 8302
+  serf_wan:
+    port: "{{ consul_conf.ports.serf_wan | default(8302) }}"
     src_ip: []
-    proto: [tcp_udp]
-  server_rpc:
-    port: 8300
+    proto: [tcp,udp]
+  server:
+    port: "{{ consul_conf.ports.server | default(8300) }}"
     src_ip: []
     proto: [tcp]
   sidecar_proxy:
-    port: '21000:21255'
+    port: "{{ consul_conf.ports.sidecar_proxy_min | default(21000) }}:{{ consul_conf.ports.sidecar_proxy_max | default(21255) }}"
     src_ip: []
     proto: [tcp]
+consul_extra_services: {}
+consul_services: "{{ consul_base_services | combine(consul_extra_services, recursive=True) }}"
 
 # Consul configuration (which will be converted to JSON)
 # The configuration is splited in a base conf and an extra conf, so you can override part of the config easily