diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2025-01-16 21:37:44 -0600 |
|---|---|---|
| committer | Indrajit Raychaudhuri <irc@indrajit.com> | 2025-01-16 22:40:08 -0600 |
| commit | 4c92ab9ff4ddf44f0d6a2bf4c7e724fc35629f0c (patch) | |
| tree | 273dfa4a3b434602761ae9b35a4fff35b796db84 /src/conf_mode | |
| parent | 99d0c7a804ea3cf7f843f0d4810e6772cf7ceeb8 (diff) | |
| download | vyos-1x-4c92ab9ff4ddf44f0d6a2bf4c7e724fc35629f0c.tar.gz vyos-1x-4c92ab9ff4ddf44f0d6a2bf4c7e724fc35629f0c.zip | |
dhcp: T5840: Merge systemd service overrides for kea-ctrl-agent
Default systemd service for kea-ctrl-agent expects
`/etc/kea/kea-api-password` which is not used in
VyOS.
The systemd unit override to remove the condition
does not need to be in a separate (templated and
dynamic) override file and can be merged into the
existing static override file.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/service_dhcp-server.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py index 9c59aa63d..47abe80df 100755 --- a/src/conf_mode/service_dhcp-server.py +++ b/src/conf_mode/service_dhcp-server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2024 VyOS maintainers and contributors +# Copyright (C) 2018-2025 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -45,7 +45,6 @@ ctrl_socket = '/run/kea/dhcp4-ctrl-socket' config_file = '/run/kea/kea-dhcp4.conf' lease_file = '/config/dhcp/dhcp4-leases.csv' lease_file_glob = '/config/dhcp/dhcp4-leases*' -systemd_override = r'/run/systemd/system/kea-ctrl-agent.service.d/10-override.conf' user_group = '_kea' ca_cert_file = '/run/kea/kea-failover-ca.pem' @@ -395,8 +394,6 @@ def generate(dhcp): dhcp['high_availability']['ca_cert_file'] = ca_cert_file - render(systemd_override, 'dhcp-server/10-override.conf.j2', dhcp) - 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, user=user_group, group=user_group) |