jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-07-31 11:45:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2024-10-08 16:00

Browse Source
This commit is contained in:
Daniel Berteaud
2024-10-08 16:00:13 +02:00
parent c8bd6e6109
commit fc993adf3d
11 changed files with 154 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ consul_base_conf:
enabled: False
# The default_policy is also used for intentions in the service mesh
default_policy: deny
enable_token_persistence: True
# enable_token_persistence: True
# You can set tokens used by the agent
# tokens:
# default: ab47bc38-d97f-19af-93a5-17b528d154c9

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

@@ -135,9 +135,13 @@ acl {
{{ key }} = {{ consul_conf.acl[key] | ternary('true', 'false') }}
{% endif %}
{% endfor %}
default_policy = "{{ consul_conf.acl.default_policy }}"
{% for key in ['token_ttl', 'policy_ttl', 'role_ttl', 'default_policy', 'down_policy', 'enable_key_list_policy'] %}
{% if consul_conf.acl[key] is defined %}
{{ key }} = "{{ consul_conf.acl[key] }}"
{% endif %}
{% endfor %}
tokens {
{% for key in ['initial_management', 'default', 'agent', 'agent_recovery', 'replication', 'config_file_service_registration'] %}
{% for key in ['initial_management', 'default', 'agent', 'agent_recovery', 'replication', 'config_file_service_registration', 'dns'] %}
{% if consul_conf.acl.tokens[key] is defined %}
{{ key }} = "{{ consul_conf.acl.tokens[key] }}"
{% endif %}
@@ -180,8 +184,8 @@ auto_encrypt {
limits {
{% for key in ['http_max_conns_per_client'] %}
{%- if consul_conf.limits[key] is defined %}
{% if consul_conf.limits[key] is defined %}
{{ key }} = {{ consul_conf.limits[key] }}
{%- endif %}
{%- endfor %}
{% endif %}
{% endfor %}
}