From 46c177b982448201cc7197a0b09a3bab19e306e5 Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Wed, 25 Jan 2017 11:47:42 +0100
Subject: [PATCH] Switch to ansible_hostname in calico
For consistancy with kubernetes services we should use the same
hostname for nodes, which is 'ansible_hostname'.
Also fixing missed 'kube-node' in templates, Calico is installed
on 'k8s-cluster' roles, not only 'kube-node'.
---
.../calico/templates/calico-node.service.legacy.j2 | 2 +-
roles/network_plugin/calico/templates/calico.env.j2 | 4 ++--
roles/network_plugin/calico/templates/cni-calico.conf.j2 | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/network_plugin/calico/templates/calico-node.service.legacy.j2 b/roles/network_plugin/calico/templates/calico-node.service.legacy.j2
index bc6f66a9d..f542f64f6 100644
--- a/roles/network_plugin/calico/templates/calico-node.service.legacy.j2
+++ b/roles/network_plugin/calico/templates/calico-node.service.legacy.j2
@@ -7,7 +7,7 @@ Wants=docker.socket
[Service]
User=root
PermissionsStartOnly=true
-{% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%}
+{% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false)%}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
{% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
diff --git a/roles/network_plugin/calico/templates/calico.env.j2 b/roles/network_plugin/calico/templates/calico.env.j2
index 47f685928..83cf8f291 100644
--- a/roles/network_plugin/calico/templates/calico.env.j2
+++ b/roles/network_plugin/calico/templates/calico.env.j2
@@ -7,9 +7,9 @@ CALICO_IP6=""
{% if calico_network_backend is defined %}
CALICO_NETWORKING_BACKEND="{{calico_network_backend }}"
{% endif %}
-{% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%}
+{% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false)%}
CALICO_AS="{{ local_as }}"
{% endif %}
CALICO_NO_DEFAULT_POOLS="true"
CALICO_LIBNETWORK_ENABLED="true"
-CALICO_HOSTNAME="{{ inventory_hostname }}"
+CALICO_HOSTNAME="{{ ansible_hostname }}"
diff --git a/roles/network_plugin/calico/templates/cni-calico.conf.j2 b/roles/network_plugin/calico/templates/cni-calico.conf.j2
index 2834e4cba..f9427e69d 100644
--- a/roles/network_plugin/calico/templates/cni-calico.conf.j2
+++ b/roles/network_plugin/calico/templates/cni-calico.conf.j2
@@ -1,7 +1,7 @@
{
"name": "calico-k8s-network",
{% if not legacy_calicoctl %}
- "hostname": "{{ inventory_hostname }}",
+ "hostname": "{{ ansible_hostname }}",
{% endif %}
"type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}",
--
GitLab