jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-10-30 18:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-08-11 12:00

Browse Source
This commit is contained in:
Daniel Berteaud
2022-08-11 12:00:16 +02:00
parent 9d4a3e4947
commit 2594e58276
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/consul/defaults/main.yml
View File

@@ -77,8 +77,14 @@ consul_base_conf:
prometheus_retention_time: 1h prometheus_retention_time: 1h
connect: connect:
# Enable consul service mesh on servers
enabled: "{{ (inventory_hostname in consul_servers | map('regex_replace', ':\\d+$', '')) | ternary(True, False) }}" enabled: "{{ (inventory_hostname in consul_servers | map('regex_replace', ':\\d+$', '')) | ternary(True, False) }}"
acl:
enabled: False
# The default_policy is also used for intentions in the service mesh
default_policy: deny
consul_extra_conf: {} consul_extra_conf: {}
consul_host_conf: {} consul_host_conf: {}
consul_conf: "{{ consul_base_conf | combine(consul_extra_conf, recursive=True) | combine(consul_host_conf, recursive=True) }}" consul_conf: "{{ consul_base_conf | combine(consul_extra_conf, recursive=True) | combine(consul_host_conf, recursive=True) }}"

5
roles/consul/templates/consul.hcl.j2
View File

@@ -71,3 +71,8 @@ connect {
enabled = true enabled = true
} }
{% endif %} {% endif %}
acl {
enabled = {{ consul_conf.acl.enabled | ternary('true', 'false') }}
default_policy = "{{ consul_conf.acl.default_policy }}"
}