summaryrefslogtreecommitdiff
path: root/cumulus
diff options
context:
space:
mode:
authorDinesh G Dutt <ddutt@cumulusnetworks.com>2016-08-13 00:41:21 -0700
committerDinesh G Dutt <ddutt@cumulusnetworks.com>2016-08-13 00:55:07 -0700
commitf04605f4e5518ca161ee4088895988c4ae050b57 (patch)
tree7c8b7150e796e660c10597f9a3c13c98420d4e7b /cumulus
parente018c7cc9a7d218ce3a28b5619761c22eb060882 (diff)
Remove individual daemon conf files and replace with Quagga.conf
Ticket: CM-11777 Reviewed By: CCR-5096 Testing Done: The recommended, and in many ways the only supported, model for the configuration file of quagga is to use a single Quagga.conf configuration file. However, we weren't shipping with this model, which led to some confusion amongst users. This patch fixes this by removing all individual daemon configuration files and replacing it with the single Quagga.conf file.
Diffstat (limited to 'cumulus')
-rw-r--r--cumulus/etc/quagga/Quagga.conf3
-rw-r--r--cumulus/etc/quagga/bgpd.conf3
-rw-r--r--cumulus/etc/quagga/ospf6d.conf3
-rw-r--r--cumulus/etc/quagga/ospfd.conf3
-rw-r--r--cumulus/etc/quagga/pimd.conf5
-rw-r--r--cumulus/etc/quagga/zebra.conf2
6 files changed, 3 insertions, 16 deletions
diff --git a/cumulus/etc/quagga/Quagga.conf b/cumulus/etc/quagga/Quagga.conf
new file mode 100644
index 0000000000..a0b3ee0cfb
--- /dev/null
+++ b/cumulus/etc/quagga/Quagga.conf
@@ -0,0 +1,3 @@
+log file /var/log/quagga/quagga.log
+log timestamp precision 6
+
diff --git a/cumulus/etc/quagga/bgpd.conf b/cumulus/etc/quagga/bgpd.conf
deleted file mode 100644
index 7c9c5ae286..0000000000
--- a/cumulus/etc/quagga/bgpd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-hostname bgpd
-log timestamp precision 6
-log file /var/log/quagga/bgpd.log
diff --git a/cumulus/etc/quagga/ospf6d.conf b/cumulus/etc/quagga/ospf6d.conf
deleted file mode 100644
index 408ca1af1e..0000000000
--- a/cumulus/etc/quagga/ospf6d.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-hostname ospfd
-log timestamp precision 6
-log file /var/log/quagga/ospf6d.log
diff --git a/cumulus/etc/quagga/ospfd.conf b/cumulus/etc/quagga/ospfd.conf
deleted file mode 100644
index 8f2e53e030..0000000000
--- a/cumulus/etc/quagga/ospfd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-hostname ospfd
-log timestamp precision 6
-log file /var/log/quagga/ospfd.log
diff --git a/cumulus/etc/quagga/pimd.conf b/cumulus/etc/quagga/pimd.conf
deleted file mode 100644
index 8aa1e7f5f0..0000000000
--- a/cumulus/etc/quagga/pimd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-hostname pimd
-password cn321
-enable password cn321
-log timestamp precision 6
-log file /var/log/quagga/pimd.log
diff --git a/cumulus/etc/quagga/zebra.conf b/cumulus/etc/quagga/zebra.conf
deleted file mode 100644
index 67e4799413..0000000000
--- a/cumulus/etc/quagga/zebra.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-hostname zebra
-log file /var/log/quagga/zebra.log