diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-04-15 15:54:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 15:54:02 +0100 |
| commit | 9e47c2153be7cc0e5ed21ca8a976336d4bf872d8 (patch) | |
| tree | ad917159c42092dfe1496edebcdd7f4025eab472 /src/conf_mode | |
| parent | 2f54cbc0504a20424274e45b9210467d33acf919 (diff) | |
| parent | 176da07ba48f9aac2e39ff45509306f0a0afe9da (diff) | |
| download | vyos-1x-9e47c2153be7cc0e5ed21ca8a976336d4bf872d8.tar.gz vyos-1x-9e47c2153be7cc0e5ed21ca8a976336d4bf872d8.zip | |
Merge pull request #4412 from sarthurdev/kea_2.6
kea: T7281: Add ping-check, use built-in option for classless static routes
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/service_dhcp-server.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py index 5a729af74..e46d916fd 100755 --- a/src/conf_mode/service_dhcp-server.py +++ b/src/conf_mode/service_dhcp-server.py @@ -41,7 +41,6 @@ from vyos import airbag airbag.enable() -ctrl_config_file = '/run/kea/kea-ctrl-agent.conf' ctrl_socket = '/run/kea/dhcp4-ctrl-socket' config_file = '/run/kea/kea-dhcp4.conf' lease_file = '/config/dhcp/dhcp4-leases.csv' @@ -480,13 +479,6 @@ def generate(dhcp): dhcp['high_availability']['ca_cert_file'] = ca_cert_file render( - ctrl_config_file, - 'dhcp-server/kea-ctrl-agent.conf.j2', - dhcp, - user=user_group, - group=user_group, - ) - render( config_file, 'dhcp-server/kea-dhcp4.conf.j2', dhcp, @@ -498,7 +490,7 @@ def generate(dhcp): def apply(dhcp): - services = ['kea-ctrl-agent', 'kea-dhcp4-server', 'kea-dhcp-ddns-server'] + services = ['kea-dhcp4-server', 'kea-dhcp-ddns-server'] if not dhcp or 'disable' in dhcp: for service in services: @@ -515,9 +507,6 @@ def apply(dhcp): if service == 'kea-dhcp-ddns-server' and 'dynamic_dns_update' not in dhcp: action = 'stop' - if service == 'kea-ctrl-agent' and 'high_availability' not in dhcp: - action = 'stop' - call(f'systemctl {action} {service}.service') return None |