From 64ba3b1694d6b1f06e7c97744e33377266755af0 Mon Sep 17 00:00:00 2001
From: Olivier Levitt <olivier.levitt@gmail.com>
Date: Fri, 10 Nov 2023 15:48:13 +0100
Subject: [PATCH] Calico : remove nodename from configmap in etcd mode

---
 roles/network_plugin/calico/templates/calico-config.yml.j2 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/roles/network_plugin/calico/templates/calico-config.yml.j2 b/roles/network_plugin/calico/templates/calico-config.yml.j2
index 4012ef784c3..69bb1b13211 100644
--- a/roles/network_plugin/calico/templates/calico-config.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-config.yml.j2
@@ -36,12 +36,6 @@ data:
           {% if calico_datastore == "kdd" %}
             "datastore_type": "kubernetes",
             "nodename": "__KUBERNETES_NODE_NAME__",
-          {% else %}
-          {% if cloud_provider is defined %}
-            "nodename": "{{ calico_kubelet_name.stdout }}",
-            {% else %}
-            "nodename": "{{ calico_baremetal_nodename }}",
-          {% endif %}
           {% endif %}
             "type": "calico",
             "log_level": "info",