From f04605f4e5518ca161ee4088895988c4ae050b57 Mon Sep 17 00:00:00 2001 From: Dinesh G Dutt Date: Sat, 13 Aug 2016 00:41:21 -0700 Subject: [PATCH] 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. --- cumulus/etc/quagga/Quagga.conf | 3 +++ cumulus/etc/quagga/bgpd.conf | 3 --- cumulus/etc/quagga/ospf6d.conf | 3 --- cumulus/etc/quagga/ospfd.conf | 3 --- cumulus/etc/quagga/pimd.conf | 5 ----- cumulus/etc/quagga/zebra.conf | 2 -- 6 files changed, 3 insertions(+), 16 deletions(-) create mode 100644 cumulus/etc/quagga/Quagga.conf delete mode 100644 cumulus/etc/quagga/bgpd.conf delete mode 100644 cumulus/etc/quagga/ospf6d.conf delete mode 100644 cumulus/etc/quagga/ospfd.conf delete mode 100644 cumulus/etc/quagga/pimd.conf delete mode 100644 cumulus/etc/quagga/zebra.conf 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 -- 2.39.5