From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Wed, 13 Feb 2019 20:24:56 +0000 (+0000)
Subject: vrrpd: update auto*, init scripts, etc
X-Git-Tag: base_7.2~330^2~82
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=97b5f22bcdb7c527725de15dcc3d37eef3340026;p=matthieu%2Ffrr.git

vrrpd: update auto*, init scripts, etc

Add vrrpd to all the usual places daemons need to go

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/configure.ac b/configure.ac
index 69f489dbc5..c228ff0c91 100755
--- a/configure.ac
+++ b/configure.ac
@@ -443,6 +443,8 @@ AC_ARG_ENABLE([fabricd],
   AS_HELP_STRING([--disable-fabricd], [do not build fabricd]))
 AC_ARG_ENABLE([bgp-announce],
   AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement]))
+AC_ARG_ENABLE([vrrpd],
+  AS_HELP_STRING([--disable-vrrpd], [do not build vrrpd]))
 AC_ARG_ENABLE([bgp-vnc],
   AS_HELP_STRING([--disable-bgp-vnc],[turn off BGP VNC support]))
 AC_ARG_ENABLE([snmp],
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 36f9259865..ebd9ac3f47 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -24,6 +24,7 @@
 %{!?with_pam:           %global  with_pam           0 }
 %{!?with_pbrd:          %global  with_pbrd          1 }
 %{!?with_pimd:          %global  with_pimd          1 }
+%{!?with_vrrpd:         %global  with_vrrpd         1 }
 %{!?with_rpki:          %global  with_rpki          0 }
 %{!?with_rtadv:         %global  with_rtadv         1 }
 %{!?with_watchfrr:      %global  with_watchfrr      1 }
@@ -124,6 +125,12 @@
     %define daemon_babeld ""
 %endif
 
+%if %{with_vrrpd}
+    %define daemon_vrrpd vrrpd
+%else
+    %define daemon_vrrpd ""
+%endif
+
 %if %{with_watchfrr}
     %define daemon_watchfrr watchfrr
 %else
@@ -136,7 +143,7 @@
     %define daemon_bfdd ""
 %endif
 
-%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} %{daemon_bfdd}
+%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} %{daemon_bfdd} %{daemon_vrrpd}
 
 #release sub-revision (the two digits after the CONFDATE)
 %{!?release_rev:        %global  release_rev        01 }
@@ -306,6 +313,11 @@ developing OSPF-API and frr applications.
 %else
     --disable-babeld \
 %endif
+%if %{with_vrrpd}
+	--enable-vrrpd \
+%else
+	--disable-vrrpd \
+%endif
 %if %{with_pam}
     --with-libpam \
 %endif
@@ -461,6 +473,9 @@ zebra_spec_add_service isisd    2608/tcp "ISISd vty"
     zebra_spec_add_service bfdd     2617/tcp "BFDd vty"
 %endif
 zebra_spec_add_service fabricd	2618/tcp "Fabricd vty"
+%if %{with_vrrpd}
+    zebra_spec_add_service vrrpd    2619/tcp "VRRPd vty"
+%endif
 
 %if "%{initsystem}" == "systemd"
     for daemon in %all_daemons ; do
@@ -596,6 +611,9 @@ fi
 %if %{with_pbrd}
     %{_sbindir}/pbrd
 %endif
+%if %{with_vrrpd}
+    %{_sbindir}/vrrpd
+%endif
 %{_sbindir}/isisd
 %{_sbindir}/fabricd
 %if %{with_ldpd}
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
index 2abff422c9..b920621d70 100644
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -29,6 +29,7 @@ sharpd=no
 pbrd=no
 bfdd=no
 fabricd=no
+vrrpd=no
 
 #
 # If this option is set the /etc/init.d/frr script automatically loads
@@ -53,6 +54,7 @@ pbrd_options="   -A 127.0.0.1"
 staticd_options="-A 127.0.0.1"
 bfdd_options="   -A 127.0.0.1"
 fabricd_options="-A 127.0.0.1"
+vrrpd_options="  -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
 #watchfrr_options=""
diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index 4612e8beaf..feeeb13f13 100644
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -16,6 +16,7 @@ if  $programname == 'babeld' or
     $programname == 'pimd' or
     $programname == 'ripd' or
     $programname == 'ripngd' or
+    $programname == 'vrrpd' or
     $programname == 'watchfrr' or
     $programname == 'zebra'
     then :omfile:$frr_log
@@ -33,6 +34,7 @@ if  $programname == 'babeld' or
     $programname == 'pimd' or
     $programname == 'ripd' or
     $programname == 'ripngd' or
+    $programname == 'vrrpd' or
     $programname == 'watchfrr' or
     $programname == 'zebra'
     then stop
diff --git a/tools/frr.in b/tools/frr.in
index 2e3a094589..d871afa42b 100755
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -25,7 +25,7 @@ FRR_VTY_GROUP="@enable_vty_group@" # frrvty
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
 # Keep zebra first and do not list watchfrr!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT="$D_PATH/frr-reload.py"