remove staticd.conf.j2 (#9182)
Why I did it resolves #8979 and #9055 How I did it Remove the file static.conf.j2,which adds the default route on eth0 from bgp docker Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
This commit is contained in:
parent
554b04f312
commit
5830852832
@ -13,8 +13,6 @@ agentx
|
||||
!
|
||||
{% include "zebra/zebra.interfaces.conf.j2" %}
|
||||
!
|
||||
{% include "staticd/staticd.default_route.conf.j2" %}
|
||||
!
|
||||
{% include "staticd/staticd.loopback_route.conf.j2" %}
|
||||
!
|
||||
{% include "bgpd/bgpd.main.conf.j2" %}
|
||||
|
@ -8,7 +8,5 @@
|
||||
!
|
||||
{% include "common/daemons.common.conf.j2" %}
|
||||
!
|
||||
{% include "staticd.default_route.conf.j2" %}
|
||||
!
|
||||
{% include "staticd.loopback_route.conf.j2" %}
|
||||
!
|
||||
|
@ -1,10 +0,0 @@
|
||||
!
|
||||
{% block default_route %}
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
|
||||
{% if prefix | ipv4 %}
|
||||
ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endblock default_route %}
|
||||
!
|
@ -32,10 +32,6 @@ link-detect
|
||||
!
|
||||
!!
|
||||
!
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
ip route 0.0.0.0/0 10.10.10.1 200
|
||||
!!
|
||||
!
|
||||
! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
|
||||
ipv6 route fc00::/64 Loopback0
|
||||
!!
|
||||
|
@ -14,8 +14,6 @@ log facility local4
|
||||
!
|
||||
! end of template: common/daemons.common.conf.j2!
|
||||
!
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
ip route 0.0.0.0/0 10.10.10.1 200
|
||||
!!
|
||||
!
|
||||
! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
|
||||
|
@ -4,11 +4,6 @@
|
||||
"hostname": "new_hostname"
|
||||
}
|
||||
},
|
||||
"MGMT_INTERFACE": {
|
||||
"eth0|10.10.10.10/24": {
|
||||
"gwaddr": "10.10.10.1"
|
||||
}
|
||||
},
|
||||
"LOOPBACK_INTERFACE": {
|
||||
"Loopback0|FC00:1::32/128": {}
|
||||
}
|
||||
|
@ -1,4 +0,0 @@
|
||||
!
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
ip route 0.0.0.0/0 10.10.10.1 200
|
||||
!
|
@ -1,7 +0,0 @@
|
||||
{
|
||||
"MGMT_INTERFACE": {
|
||||
"eth0|10.10.10.10/24": {
|
||||
"gwaddr": "10.10.10.1"
|
||||
}
|
||||
}
|
||||
}
|
@ -81,12 +81,6 @@ def test_common_functions():
|
||||
"common/functions.conf.json",
|
||||
"common/functions.conf")
|
||||
|
||||
def test_staticd_default_route():
|
||||
run_test("staticd.default_route.conf.j2",
|
||||
"staticd/staticd.default_route.conf.j2",
|
||||
"staticd/staticd.default_route.conf.json",
|
||||
"staticd/staticd.default_route.conf")
|
||||
|
||||
def test_staticd_loopback_route():
|
||||
run_test("staticd.loopback_route.conf.j2",
|
||||
"staticd/staticd.loopback_route.conf.j2",
|
||||
|
@ -35,10 +35,6 @@ link-detect
|
||||
!
|
||||
!!
|
||||
!
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
ip route 0.0.0.0/0 10.0.0.1 200
|
||||
!!
|
||||
!
|
||||
!
|
||||
! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
|
||||
ipv6 route fc00:1::/64 Loopback0
|
||||
|
@ -35,10 +35,6 @@ link-detect
|
||||
!
|
||||
!!
|
||||
!
|
||||
! set static default route to mgmt gateway as a backup to learned default
|
||||
ip route 0.0.0.0/0 10.0.0.1 200
|
||||
!!
|
||||
!
|
||||
!
|
||||
! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
|
||||
ipv6 route fc00:1::/64 Loopback0
|
||||
|
@ -69,6 +69,4 @@ class TestCfgGen(TestCase):
|
||||
def test_zebra_frr(self):
|
||||
self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr.conf'))
|
||||
|
||||
def test_staticd_frr(self):
|
||||
self.assertTrue(*self.run_case('staticd/staticd.conf.j2', 'staticd_frr.conf'))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user