aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2020-11-30 15:33:33 +0000
committerPeter Mikus <pmikus@cisco.com>2020-11-30 15:35:34 +0000
commit06a8bd1e4bea55bd4efaa38e07d724106e0ebe73 (patch)
treea1134c1f7abf5049263597a2dddae07498cccc7b /resources/tools/testbed-setup/ansible/roles
parentd758c62e0ec929eb70ee671d6fcbeab9d61d3b8a (diff)
Ansible: Final consul.d fixes
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I2b5f2d090ac752c85508030c4dfe206023f1184f
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml8
-rw-r--r--resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j28
2 files changed, 2 insertions, 14 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
index 4825afab35..89121fde2e 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
@@ -68,16 +68,12 @@ consul_certificates:
- src: "{{ vault_consul_key_file }}"
dest: "{{ consul_key_file }}"
-consul_address: "127.0.0.1:8500"
-consul_auth: ""
consul_auto_advertise: true
-consul_checks_use_advertise: false
+consul_checks_use_advertise: true
consul_server_service_name: "nomad"
consul_client_service_name: "nomad-client"
consul_server_auto_join: false
-consul_client_auto_join: false
-consul_ssl: true
-consul_verify_ssl: true
+consul_client_auto_join: true
consul_ACL_token_set: false
consul_token: "consul_token_default"
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2 b/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
index 6bd235f28d..c78e5e1ce5 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
+++ b/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
@@ -1,18 +1,10 @@
consul {
- address = "{{ consul_address }}"
- auth = "{{ consul_auth }}"
auto_advertise = {{ consul_auto_advertise | bool | lower }}
- ca_file = "{{ consul_ca_file }}"
- cert_file = "{{ consul_cert_file }}"
checks_use_advertise = {{ consul_checks_use_advertise | bool | lower }}
client_auto_join = {{ consul_client_auto_join | bool | lower }}
client_service_name = "{{ consul_client_service_name }}"
- key_file = "{{ consul_key_file }}"
server_service_name = "{{ consul_server_service_name }}"
server_auto_join = {{ consul_server_auto_join | bool | lower }}
- ssl = {{ consul_ssl | bool | lower }}
- verify_ssl = {{ consul_verify_ssl | bool | lower }}
-
{% if consul_ACL_token_set == True %}
token = "{{ consul_token }}"
{% endif %}