fixed issues in zebra config service, updated config services to start and validate different modes appropriately, added service dependency startup for config services
This commit is contained in:
parent
0749dcacb2
commit
fcc445bb72
6 changed files with 140 additions and 23 deletions
|
@ -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,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
% for ifc, ip4s, ip6s in interfaces:
|
||||
% for ifc, ip4s, ip6s, is_control in interfaces:
|
||||
interface ${ifc.name}
|
||||
% if want_ip4:
|
||||
% for addr in ip4s:
|
||||
|
@ -19,5 +19,5 @@ interface ${ifc.name}
|
|||
% endfor
|
||||
|
||||
% for service in services:
|
||||
${service.quagga_config()}
|
||||
${service.quagga_config()}
|
||||
% endfor
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue