Ensures BGPPeer resource names are unique

6 years ago · fb1678d425
1 changed files with 2 additions and 2 deletions
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@ -165,7 +165,7 @@
   "apiVersion": "projectcalico.org/v3",
   "kind": "BGPPeer",
   "metadata": {
-      "name": "{{ inventory_hostname }}-bgp"
+      "name": "{{ inventory_hostname }}-{{ item.router_id }}"
   },
   "spec": {
      "asNumber": "{{ item.as }}",
@ -204,7 +204,7 @@
   "apiVersion": "projectcalico.org/v3",
   "kind": "BGPPeer",
   "metadata": {
-      "name": "{{ inventory_hostname }}"
+      "name": "{{ inventory_hostname }}-{{ hostvars[item]["calico_rr_ip"]|default(hostvars[item]["ip"])|default(hostvars[item]["ansible_default_ipv4"]["address"]) }}"
   },
   "spec": {
      "asNumber": "{{ local_as | default(global_as_num)}}",