allow overriding calico peers names and avoid ipv6 naming issues (kub…

…ernetes-sigs#7591)
sakuraiyuta · Apr 16, 2022 · 97427af · 97427af
1 parent 73306ee
commit 97427af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
@@ -227,7 +227,7 @@
       {"apiVersion": "projectcalico.org/v3",
       "kind": "BGPPeer",
       "metadata": {
-        "name": "global-{{ item.router_id }}"
+        "name": "global-{{ item.name | default(item.router_id|replace(':','-')) }}"
       },
       "spec": {
         "asNumber": "{{ item.as }}",
@@ -381,7 +381,7 @@
       {"apiVersion": "projectcalico.org/v3",
       "kind": "BGPPeer",
       "metadata": {
-        "name": "{{ inventory_hostname }}-{{ item.router_id }}"
+        "name": "{{ inventory_hostname }}-{{ item.name | default(item.router_id|replace(':','-')) }}"
       },
       "spec": {
         "asNumber": "{{ item.as }}",