Explorar o código

bird template doesn't require uplinks any more

Till Klocke %!s(int64=9) %!d(string=hai) anos
pai
achega
35c2dc6d41

+ 2 - 0
roles/supernode-interfaces/templates/bird.conf.j2

@@ -28,6 +28,7 @@ template bgp ibgp {
         multihop 64;
         multihop 64;
 };
 };
 
 
+{% if supernode_uplinks is defined %}
 {% for uplink in supernode_uplinks %}
 {% for uplink in supernode_uplinks %}
 protocol bgp {{uplink.name}} from ibgp {
 protocol bgp {{uplink.name}} from ibgp {
         source address {{uplink.address}};
         source address {{uplink.address}};
@@ -36,6 +37,7 @@ protocol bgp {{uplink.name}} from ibgp {
 };
 };
 
 
 {% endfor %}
 {% endfor %}
+{% endif %}
 
 
 {% for meshlink in supernode_mesh_backbones%}
 {% for meshlink in supernode_mesh_backbones%}
 protocol bgp {{meshlink.name}} from ibgp {
 protocol bgp {{meshlink.name}} from ibgp {

+ 2 - 0
roles/supernode-interfaces/templates/bird6.conf.j2

@@ -37,6 +37,7 @@ template bgp ibgp {
         gateway direct;
         gateway direct;
 }
 }
 
 
+{% if supernode_uplinks is defined %}
 template bgp uplink {
 template bgp uplink {
         local as {{supernode_uplinks[0].as}};
         local as {{supernode_uplinks[0].as}};
         import all;
         import all;
@@ -53,6 +54,7 @@ protocol bgp {{uplink.name}} from uplink {
 }
 }
 
 
 {% endfor %}
 {% endfor %}
+{% endif %}
 
 
 {% for meshlink in supernode_mesh_backbones %}
 {% for meshlink in supernode_mesh_backbones %}
 protocol bgp {{meshlink.name}} from ibgp {
 protocol bgp {{meshlink.name}} from ibgp {