debian: Fix up some issues Dave pointed out and Fix Multi-Instance OSPF

Address some start/stop issues that Dave has pointed out, in addition add
the ability to work with multi-instance ospf.

Ticket: CM-9298
Reviewed-by: Dave Olson
Testing: By hand and passed to Atul for further testing

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 6772787549319c7ba356125cc37ea5b8aaa711d5..c7dc9418f399c9459543e624dcbd62d1a870ea9d 100644 (file)
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cumulus Linux Quagga BGP Daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
@@ -12,6 +13,7 @@ StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
+Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/bgpd $BGPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n

diff --git a/debian/isisd.service b/debian/isisd.service
index 04b128a8e2e44c8f172dc4768de7a01495b2d813..ba2ca682128bb51b43b4fd965ba84a90a36fede6 100644 (file)
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=IS-IS routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]

diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 48b6ddb3193db78ce052cb85354be8558d9b9e6f..2dee461acfa4b8f68e3cd25e1c12ec12d9a789ad 100644 (file)
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OSPF routing daemon for IPv6
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]

diff --git a/debian/ospfd.service b/debian/ospfd.service
index d4213c8ad71c7f0a5a49aea715a5a11ff830e272..907d546d76d2d46979326b9ebfed67c625917e05 100644 (file)
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OSPF routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
@@ -17,4 +18,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
 [Install]
-WantedBy=networkonline.target
+WantedBy=network-online.target

diff --git a/debian/ospfd@.service b/debian/ospfd@.service
new file mode 100644 (file)
index 0000000..2cdaea8
--- /dev/null
+++ b/debian/ospfd@.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=OSPF routing daemon %I
+After=syslog.target networking.service zebra.service
+Requires=zebra.service
+OnFailure=heartbeat-failed@%n.service
+
+[Service]
+Type=notify
+Nice=-5
+EnvironmentFile=/etc/default/quagga
+StartLimitInterval=3m
+StartLimitBurst=3
+TimeoutSec=1m
+WatchdogSec=60s
+RestartSec=5
+Restart=on-abnormal
+LimitNOFILE=1024
+ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS -n %I
+ExecStartPost=/usr/bin/vtysh -b  -n
+[Install]
+WantedBy=network-online.target

diff --git a/debian/ripd.service b/debian/ripd.service
index 7b131b87beae37d343b252727823fda9975c9968..661b83b5c2a646c38936f7adf7d387f44dd3be13 100644 (file)
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RIP routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]

diff --git a/debian/ripngd.service b/debian/ripngd.service
index 8c98620aef5a765b3c405e02a207d64645123756..cd39feeb8de7ba5c1cea8d914a6217bf16499e82 100644 (file)
--- a/debian/ripngd.service
+++ b/debian/ripngd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RIP routing daemon for IPv6
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]