Skip to content

Commit 1824f30

Browse files
sever-seversever-sever
authored
Merge pull request #4723 from sarthurdev/kea3.0
kea: T7821: Update Kea to 3.0
2 parents f46bd3a + 34332df commit 1824f30

14 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎debian/control‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,10 @@ Depends:
221221
# For "service dhcp-relay"
222222
isc-dhcp-relay,
223223
# For "service dhcp-server"
224-
kea,
224+
isc-kea-dhcp4,
225+
isc-kea-dhcp6,
226+
isc-kea-dhcp-ddns,
227+
isc-kea-hooks,
225228
# End "service dhcp-server"
226229
# For "service lldp"
227230
lldpd,

‎op-mode-definitions/monitor-log.xml.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
<properties>
4545
<help>Monitor last lines of DHCP server log</help>
4646
</properties>
47-
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp4-server.service</command>
47+
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp4.service</command>
4848
<children>
4949
<tagNode name="vrf">
5050
<properties>
5151
<help>Monitor last lines of DHCP server log on specific vrf</help>
5252
</properties>
53-
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4-server@$6.service"</command>
53+
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4@$6.service"</command>
5454
</tagNode>
5555
</children>
5656
</node>
@@ -82,13 +82,13 @@
8282
<properties>
8383
<help>Monitor last lines of DHCPv6 server log</help>
8484
</properties>
85-
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp6-server.service</command>
85+
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp6.service</command>
8686
<children>
8787
<tagNode name="vrf">
8888
<properties>
8989
<help>Monitor last lines of DHCPv6 server log on specific vrf</help>
9090
</properties>
91-
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp6-server@$6.service"</command>
91+
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp6@$6.service"</command>
9292
</tagNode>
9393
</children>
9494
</node>

‎op-mode-definitions/show-log.xml.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@
104104
<properties>
105105
<help>Show log for DHCP server</help>
106106
</properties>
107-
<command>journalctl --no-hostname --boot --unit kea-dhcp4-server.service</command>
107+
<command>journalctl --no-hostname --boot --unit kea-dhcp4.service</command>
108108
<children>
109109
<tagNode name="vrf">
110110
<properties>
111111
<help>Monitor last lines of DHCP server log on specific vrf</help>
112112
</properties>
113-
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4-server@$6.service"</command>
113+
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4@$6.service"</command>
114114
</tagNode>
115115
</children>
116116
</node>
@@ -142,13 +142,13 @@
142142
<properties>
143143
<help>Show log for DHCPv6 server</help>
144144
</properties>
145-
<command>journalctl --no-hostname --boot --unit kea-dhcp6-server.service</command>
145+
<command>journalctl --no-hostname --boot --unit kea-dhcp6.service</command>
146146
<children>
147147
<tagNode name="vrf">
148148
<properties>
149149
<help>Monitor last lines of DHCPv6 server log on specific vrf</help>
150150
</properties>
151-
<command>journalctl --no-hostname --boot --unit "kea-dhcp6-server@$6.service"</command>
151+
<command>journalctl --no-hostname --boot --unit "kea-dhcp6@$6.service"</command>
152152
</tagNode>
153153
</children>
154154
</node>

‎smoketest/scripts/cli/test_service_dhcp-server.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
PROCESS_NAME = 'kea-dhcp4'
3535
D2_PROCESS_NAME = 'kea-dhcp-ddns'
36-
CTRL_PROCESS_NAME = 'kea-ctrl-agent'
3736
KEA4_CONF = '/run/kea/kea-dhcp4.conf'
3837
KEA4_D2_CONF = '/run/kea/kea-dhcp-ddns.conf'
3938
KEA4_CTRL = '/run/kea/dhcp4-ctrl-socket'

‎src/conf_mode/service_dhcp-server.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,9 @@ def apply(dhcp):
582582
# if running in vrf, set base diffrently
583583
if argv and len(argv) > 1:
584584
vrf_name = argv[1]
585-
services = [f'kea-dhcp4-server@{vrf_name}', f'kea-dhcp-ddns-server@{vrf_name}']
585+
services = [f'kea-dhcp4@{vrf_name}', f'kea-dhcp-ddns@{vrf_name}']
586586
else:
587-
services = ['kea-dhcp4-server', 'kea-dhcp-ddns-server']
587+
services = ['kea-dhcp4', 'kea-dhcp-ddns']
588588

589589
if not dhcp or 'disable' in dhcp:
590590
for service in services:

‎src/conf_mode/service_dhcpv6-server.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ def apply(dhcpv6):
289289
# if running in vrf, set base diffrently
290290
if argv and len(argv) > 1:
291291
vrf_name = argv[1]
292-
service_name = f'kea-dhcp6-server@{vrf_name}.service'
292+
service_name = f'kea-dhcp6@{vrf_name}.service'
293293
else:
294-
service_name = 'kea-dhcp6-server.service'
294+
service_name = 'kea-dhcp6.service'
295295

296296
# bail out early - looks like removal from running config
297297
if not dhcpv6 or 'disable' in dhcpv6:

src/etc/systemd/system/kea-dhcp-ddns-server.service.d/override.conf renamed to src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf

File renamed without changes.

src/etc/systemd/system/kea-dhcp-ddns-server@.service renamed to src/etc/systemd/system/kea-dhcp-ddns@.service

File renamed without changes.

src/etc/systemd/system/kea-dhcp4-server.service.d/override.conf renamed to src/etc/systemd/system/kea-dhcp4.service.d/override.conf

File renamed without changes.

src/etc/systemd/system/kea-dhcp4-server@.service renamed to src/etc/systemd/system/kea-dhcp4@.service

File renamed without changes.

0 commit comments

Comments
 (0)