Matching nodeName entry to the environment
variable named HOSTNAME/NODENAME in the
/etc/systemd/system/calico-node.service.
Change-Id: I12fd54ffa4020dc5362d5706ff496511de442b97
diff --git a/kubernetes/files/calico/calico.conf b/kubernetes/files/calico/calico.conf
index 4245431..7952945 100644
--- a/kubernetes/files/calico/calico.conf
+++ b/kubernetes/files/calico/calico.conf
@@ -1,7 +1,7 @@
{%- from "kubernetes/map.jinja" import common with context -%}
{%- from "kubernetes/map.jinja" import pool with context -%}
{
- "nodeName": "{{ pool.host.name }}",
+ "nodeName": "{{ pool.host.name }}{% if pool.host.get('domain') %}.{{ pool.host.domain }}{%- endif %}",
"name": "calico-k8s-network",
"type": "calico",
"etcd_endpoints": "{% for member in pool.network.etcd.members %}http{% if pool.network.etcd.get('ssl', {}).get('enabled') %}s{% endif %}://{{ member.host }}:{{ member.port }}{% if not loop.last %},{% endif %}{% endfor %}",