Merge branch 'leonard/kea-2.6' into 'master'

Update kea to 2.6 for Debian 12

See merge request !1

roles/dhcpserver/defaults/main.yml

 ---
 dhcp_server_interface: eth255
 dhcp_config_gen_dir: /var/lib/ffs/config-generator
-dhcp_kea_socket: /run/kea/kea4-ctrl-socket
+dhcp_kea_socket: /var/run/kea/kea4-ctrl-socket
 # which segments to serve pools on. empty means all segments.
 dhcp_segments: []

roles/dhcpserver/files/apt-debian-bookworm-2-4.list

-# Source: ISC - Internet Systems Consortium
-# Site: https://gitlab.isc.org/isc-projects/kea
-# Repository: ISC - Internet Systems Consortium / kea-2-4
-# Description: Kea 2.4 is the current stable version, suitable for production deployment. The software in this repository is licensed under the MPL 2.0 open source license. Professional technical support is available from ISC.org.
-
-
-deb [signed-by=/usr/share/keyrings/isc-kea-2-4-archive-keyring.gpg] https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian bookworm main
-
-deb-src [signed-by=/usr/share/keyrings/isc-kea-2-4-archive-keyring.gpg] https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian bookworm main

roles/dhcpserver/files/apt-debian-bookworm-2-6.list

+# Source: ISC - Internet Systems Consortium
+# Site: https://gitlab.isc.org/isc-projects/kea
+# Repository: ISC - Internet Systems Consortium / kea-2-6
+# Description: Kea 2.6 is the soon-to-be-released stable version, suitable for production deployment. The software in this repository is licensed under the MPL 2.0 open source license. Professional technical support is available from ISC.org.
+
+
+deb [signed-by=/usr/share/keyrings/isc-kea-2-6-archive-keyring.gpg] https://dl.cloudsmith.io/public/isc/kea-2-6/deb/debian bookworm main
+
+deb-src [signed-by=/usr/share/keyrings/isc-kea-2-6-archive-keyring.gpg] https://dl.cloudsmith.io/public/isc/kea-2-6/deb/debian bookworm main

roles/dhcpserver/handlers/main.yml

 ---
 - name: restart kea4
-  service: name=kea-dhcp4-server state=restarted
+  service: name=isc-kea-dhcp4-server state=restarted
 - name: restart kea-exporter
   service: name=kea-exporter state=restarted

roles/dhcpserver/tasks/main.yml

@@ -12,10 +12,10 @@
 # On Debian 11, we used to use the kea packages from ISC. Now, kea 2.2
 # is in Debian, but that does not support ignore-dhcp-server-identifier,
 # which we need to relaying to work.
-# So we use kea 2.4 from kea to be as close as possible to the packages that
+# So we use kea 2.6 from kea to be as close as possible to the packages that
 # will likely be in the next Debian release.
 - name: Install kea-dhcp from ISC repos
-  include_tasks: setup-cloudsmith-repo-2-4.yml
+  include_tasks: setup-cloudsmith-repo-2-6.yml
   when: ansible_facts['distribution_major_version'] == "12"
 
 # This is for future when we can finally use the packages from Debian.

roles/dhcpserver/tasks/setup-cloudsmith-repo-2-4.yml → roles/dhcpserver/tasks/setup-cloudsmith-repo-2-6.yml

@@ -16,15 +16,25 @@
     path: /etc/apt/sources.list.d/isc-kea-2-3.list
     state: absent
 
+- name: Remove cloudsmith kea 2.4 APT key
+  ansible.builtin.file:
+    path: /usr/share/keyrings/isc-kea-2-4-archive-keyring.gpg
+    state: absent
+
+- name: Remove cloudsmith kea 2.4 repo
+  ansible.builtin.file:
+    path: /etc/apt/sources.list.d/isc-kea-2-3.list
+    state: absent
+
 - name: Install cloudsmith APT key
   ansible.builtin.copy:
-    src: apt-cloudsmith-kea-2-4.gpg.key
-    dest: /usr/share/keyrings/isc-kea-2-4-archive-keyring.gpg
+    src: apt-cloudsmith-kea-2-6.gpg.key
+    dest: /usr/share/keyrings/isc-kea-2-6-archive-keyring.gpg
 
 - name: Install cloudsmith repo
   ansible.builtin.copy:
-    src: apt-debian-bookworm-2-4.list
-    dest: /etc/apt/sources.list.d/isc-kea-2-4.list
+    src: apt-debian-bookworm-2-6.list
+    dest: /etc/apt/sources.list.d/isc-kea-2-6.list
 
 - name: Installing kea-dhcp4
   apt: