Merge pull request #4743 from sarthurdev/kea3.0

kea: T7281: Fix Kea 3.0 service failures

2 files changed, 5 insertions, 5 deletions

diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index ae0338996..d92321ab8 100755
--- a/src/conf_mode/service_dhcp-server.py
+++ b/src/conf_mode/service_dhcp-server.py
@@ -582,9 +582,9 @@ def apply(dhcp):
     # if running in vrf, set base diffrently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
-        services = [f'kea-dhcp4@{vrf_name}', f'kea-dhcp-ddns@{vrf_name}']
+        services = [f'isc-kea-dhcp4-server@{vrf_name}', f'isc-kea-dhcp-ddns-server@{vrf_name}']
     else:
-        services = ['kea-dhcp4', 'kea-dhcp-ddns']
+        services = ['isc-kea-dhcp4-server', 'isc-kea-dhcp-ddns-server']
 
     if not dhcp or 'disable' in dhcp:
         for service in services:
@@ -598,7 +598,7 @@ def apply(dhcp):
     for service in services:
         action = 'restart'
 
-        if 'kea-dhcp-ddns-server' in service and 'dynamic_dns_update' not in dhcp:
+        if 'isc-kea-dhcp-ddns-server' in service and 'dynamic_dns_update' not in dhcp:
             action = 'stop'
 
         call(f'systemctl {action} {service}.service')
diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py
index 1b2f07e43..b6a7a87c3 100755
--- a/src/conf_mode/service_dhcpv6-server.py
+++ b/src/conf_mode/service_dhcpv6-server.py
@@ -289,9 +289,9 @@ def apply(dhcpv6):
     # if running in vrf, set base diffrently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
-        service_name = f'kea-dhcp6@{vrf_name}.service'
+        service_name = f'isc-kea-dhcp6-server@{vrf_name}.service'
     else:
-        service_name = 'kea-dhcp6.service'
+        service_name = 'isc-kea-dhcp6-server.service'
 
     # bail out early - looks like removal from running config
     if not dhcpv6 or 'disable' in dhcpv6: