Merge pull request #241 from apwiggins/FRR-patch-1

Frr patch 1 - add basic FRR service functionality
This commit is contained in:
bharnden 2019-04-24 22:57:50 -07:00 committed by GitHub
commit f283c747cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View file

@ -171,7 +171,7 @@ bootdaemon()
flags="" flags=""
if [ "$1" = "xpimd" ] && \\ if [ "$1" = "pimd" ] && \\
grep -E -q '^[[:space:]]*router[[:space:]]+pim6[[:space:]]*$' $FRR_CONF; then grep -E -q '^[[:space:]]*router[[:space:]]+pim6[[:space:]]*$' $FRR_CONF; then
flags="$flags -6" flags="$flags -6"
fi fi
@ -210,7 +210,7 @@ bootfrr()
done done
if grep -E -q '^[[:space:]]*router[[:space:]]+pim6?[[:space:]]*$' $FRR_CONF; then if grep -E -q '^[[:space:]]*router[[:space:]]+pim6?[[:space:]]*$' $FRR_CONF; then
bootdaemon "xpimd" bootdaemon "pimd"
fi fi
$FRR_BIN_DIR/vtysh -b $FRR_BIN_DIR/vtysh -b
@ -597,7 +597,7 @@ class FRRBabel(FrrService):
if hasattr(ifc, "control") and ifc.control is True: if hasattr(ifc, "control") and ifc.control is True:
continue continue
cfg += " network %s\n" % ifc.name cfg += " network %s\n" % ifc.name
cfg += " redistribute static\n redistribute connected\n" cfg += " redistribute static\n redistribute ipv4 connected\n"
return cfg return cfg
@classmethod @classmethod
@ -608,14 +608,14 @@ class FRRBabel(FrrService):
return " babel wired\n babel split-horizon\n" return " babel wired\n babel split-horizon\n"
class FRRXpimd(FrrService): class FRRpimd(FrrService):
""" """
PIM multicast routing based on XORP. PIM multicast routing based on XORP.
""" """
name = 'FRRXpimd' name = 'FRRpimd'
startup = () startup = ()
shutdown = ('killall xpimd',) shutdown = ('killall pimd',)
validate = ('pidof xpimd',) validate = ('pidof pimd',)
ipv4_routing = True ipv4_routing = True
@classmethod @classmethod

View file

@ -12,6 +12,9 @@ port = 4038
numthreads = 1 numthreads = 1
quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga" quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga"
quagga_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/quagga" quagga_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/quagga"
frr_bin_search = "/usr/local/bin /usr/bin /usr/lib/frr"
frr_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/frr"
# uncomment the following line to load custom services from the specified dir # uncomment the following line to load custom services from the specified dir
# this may be a comma-separated list, and directory names should be unique # this may be a comma-separated list, and directory names should be unique
# and not named 'services' # and not named 'services'