afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed issues in zebra config service, updated config services to start and validate different modes appropriately, added service dependency startup for config services

Browse source
This commit is contained in:
Blake Harnden 2020-01-23 13:22:47 -08:00
parent 0749dcacb2
commit fcc445bb72
6 changed files with 140 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/configservices/quaggaservices/services.py
View file

@ -62,10 +62,10 @@ class Zebra(ConfigService):
def data(self) -> Dict[str, Any]:
quagga_bin_search = self.node.session.options.get_config(
"quagga_bin_search", default="/usr/local/bin /usr/bin /usr/lib/quagga"
)
).strip('"')
quagga_sbin_search = self.node.session.options.get_config(
"quagga_sbin_search", default="/usr/local/sbin /usr/sbin /usr/lib/quagga"
)
).strip('"')
quagga_state_dir = constants.QUAGGA_STATE_DIR
quagga_conf = self.files[0]
@ -102,6 +102,7 @@ class Zebra(ConfigService):
interfaces=interfaces,
want_ip4=want_ip4,
want_ip6=want_ip6,
services=services,
)