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

Update to 2023-07-19 18:00

Browse Source
This commit is contained in:
Daniel Berteaud
2023-07-19 18:00:26 +02:00
parent a47b4985b2
commit 46009264eb
14 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ acl {
{% endfor %}
default_policy = "{{ consul_conf.acl.default_policy }}"
tokens {
{% for key in ['initial_management', 'default', 'agent', 'agent_recovery', 'replication'] %}
{% for key in ['initial_management', 'default', 'agent', 'agent_recovery', 'replication', 'config_file_service_registration'] %}
{% if consul_conf.acl.tokens[key] is defined %}
{{ key }} = "{{ consul_conf.acl.tokens[key] }}"
{% endif %}

9
roles/consul/templates/reload.hcl.j2
View File

@@ -9,9 +9,12 @@ node_meta {
{% for service in consul_catalog_services.keys() | list %}
services {
id = "{{ service }}"
name = "{{ consul_extra_catalog_services[service].name }}"
address = "{{ consul_extra_catalog_services[service].address }}"
port = {{ consul_extra_catalog_services[service].port }}
name = "{{ consul_catalog_services[service].name }}"
address = "{{ consul_catalog_services[service].address }}"
port = {{ consul_catalog_services[service].port }}
{% if consul_catalog_services[service].token is defined %}
token = "{{ consul_catalog_services[service].token }}"
{% endif %}
}
{% endfor %}