Merge pull request #2795 from gfkse/baremetal-override-calico-hostname

Make Calico nodename overridable on bare metal
kubernetes-sigs · Jun 25, 2018 · 73a2a18 · 73a2a18
2 parents 2ef05fb + 476b14b
commit 73a2a18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
@@ -51,3 +51,5 @@ rbac_resources:
 # * interface=INTERFACE-REGEX
 # see https://docs.projectcalico.org/v3.0/reference/node/configuration#ip-autodetection-methods
 # calico_ip_auto_method: "interface=eth.*"
+
+calico_baremetal_nodename: "{{ inventory_hostname }}"
diff --git a/roles/network_plugin/calico/templates/cni-calico.conflist.j2 b/roles/network_plugin/calico/templates/cni-calico.conflist.j2
@@ -6,7 +6,7 @@
     {% if cloud_provider is defined %}
       "nodename": "{{ calico_kubelet_name.stdout }}",
     {% else %}
-      "nodename": "{{ inventory_hostname }}",
+      "nodename": "{{ calico_baremetal_nodename }}",
     {% endif %}
       "type": "calico",
       "etcd_endpoints": "{{ etcd_access_addresses }}",