WIP

ansible/roles/consul/templates/config.json

@@ -1,8 +1,7 @@
 {
   "log_level": "INFO",
-  "node_name": "{{ ansible_hostname }}",
   "domain": "{{ consul_domain }}",
-  "server": true,
+  "datacenter": "{{ consul_datacenter | mandatory }}",
   "key_file": "{{ consul_key_file }}",
   "cert_file": "{{ consul_cert_file }}",
   "ca_file": "{{ consul_ca_file }}",
@@ -10,17 +9,20 @@
   "verify_outgoing": true,
   "verify_server_hostname": true,
   "encrypt": "{{ consul_secret_key }}",
+  "data_dir": "/opt/consul",
+{% if consul_server %}
+  "node_name": "{{ ansible_hostname }}",
+  "server": true,
   "ui": true,
   "leave_on_terminate": true,
-  "data_dir": "/opt/consul",
-  "datacenter": "{{ consul_datacenter | mandatory }}",
   "client_addr": "{{ consul_client_addr }}",
   "bind_addr": "{{ consul_bind_addr }}",
   "advertise_addr": "{{ consul_advertise_addr }}",
-  "bootstrap_expect": {{ consul_nodes | length }},
-  "retry_join": ["{{ consul_nodes | join('", "') }}"],
+  "bootstrap_expect": {{ consul_servers | length }},
   "enable_syslog": true,
   "performance": {
     "raft_multiplier": 1
-  }
+  },
+{% endif %}
+  "retry_join": ["{{ consul_servers | join('", "') }}"]
 }