From fef2fea9d6f3ab803b6794047353e7452c4fe1de Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Thu, 15 Feb 2024 17:32:12 +0100 Subject: [PATCH 1/3] [ipxe] Remove support for Debian Stretch --- CHANGELOG.rst | 9 +++++++++ ansible/roles/ipxe/defaults/main.yml | 20 +------------------ .../roles/ipxe/meta/watch-firmware-stretch | 10 ---------- ansible/roles/ipxe/meta/watch-netboot-stretch | 10 ---------- 4 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 ansible/roles/ipxe/meta/watch-firmware-stretch delete mode 100644 ansible/roles/ipxe/meta/watch-netboot-stretch diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 29eee14823..13ab81be7a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -76,6 +76,15 @@ Changed which needs to be synchronized with the Elasticsearch configuration via Ansible inventory (Kibana can be installed separately from Elasticsearch). +Removed +~~~~~~~ + +:ref:`debops.ipxe` role +''''''''''''''''''''''' + +- Debian 9 (Stretch) has been removed from Debian mirrors, therefore the role + will no longer offer support for installing Debian Stretch via PXE boot. + `debops v3.1.0`_ - 2023-11-29 ----------------------------- diff --git a/ansible/roles/ipxe/defaults/main.yml b/ansible/roles/ipxe/defaults/main.yml index 801586a29d..21bfd706f6 100644 --- a/ansible/roles/ipxe/defaults/main.yml +++ b/ansible/roles/ipxe/defaults/main.yml @@ -103,7 +103,7 @@ ipxe__debian_netboot_firmware_mirror: 'https://cdimage.debian.org/cdimage/unoffi # # Specify which Debian releases will be prepared for iPXE boot on a given host. # The releases need to be defined in the OS release map below. -ipxe__debian_netboot_releases: [ 'stretch', 'buster', 'bullseye', 'bookworm' ] +ipxe__debian_netboot_releases: [ 'buster', 'bullseye', 'bookworm' ] # ]]] # .. envvar:: ipxe__debian_netboot_architectures [[[ @@ -125,23 +125,6 @@ ipxe__debian_netboot_architectures: [ 'amd64', 'i386', 'arm64' ] # The list of the default Debian Installer releases defined by the role. ipxe__debian_netboot_default_release_map: - - name: 'stretch-amd64' - release: 'stretch' - architecture: 'amd64' - netboot_version: '20170615+deb9u9' - netboot_checksum: 'sha256:f25408235e7a13fb05804512ad415ec78ce8e5d18f31cd2bdfe5b75c2c373047' # netboot.tar.gz - firmware_version: '20200718' - firmware_checksum: 'sha256:77fd3c1f66b530c868ac2a1d2b27cd2fc2e4a592bff48726c8e2e475d1a7eb16' # firmware.cpio.gz - - - name: 'stretch-amd64-gtk' - release: 'stretch' - architecture: 'amd64' - netboot_subdir: '/gtk' - netboot_version: '20170615+deb9u9' - netboot_checksum: 'sha256:3ba002234396044fec57faecd60acd77968850f92c67ef209731231eaf3b38e4' # gtk/netboot.tar.gz - firmware_version: '20200718' - firmware_checksum: 'sha256:77fd3c1f66b530c868ac2a1d2b27cd2fc2e4a592bff48726c8e2e475d1a7eb16' # firmware.cpio.gz - - name: 'buster-amd64' release: 'buster' architecture: 'amd64' @@ -440,7 +423,6 @@ ipxe__default_scripts: item bookworm ${space} Debian GNU/Linux 12 (Bookworm) item bullseye ${space} Debian GNU/Linux 11 (bullseye) item buster ${space} Debian GNU/Linux 10 (buster) - item stretch ${space} Debian GNU/Linux 9 (stretch) choose --default ${debian-installer-cursor} version || goto debian_exit set debian-installer-cursor ${version} diff --git a/ansible/roles/ipxe/meta/watch-firmware-stretch b/ansible/roles/ipxe/meta/watch-firmware-stretch deleted file mode 100644 index ad59c939ec..0000000000 --- a/ansible/roles/ipxe/meta/watch-firmware-stretch +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2015-2019 Maciej Delmanowski -# Copyright (C) 2015-2019 DebOps -# SPDX-License-Identifier: GPL-3.0-only - -# Role: ipxe -# Package: firmware-stretch -# Version: 20200718 - -version=4 -https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stretch (20.+)/ diff --git a/ansible/roles/ipxe/meta/watch-netboot-stretch b/ansible/roles/ipxe/meta/watch-netboot-stretch deleted file mode 100644 index ae799e8df5..0000000000 --- a/ansible/roles/ipxe/meta/watch-netboot-stretch +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2015-2019 Maciej Delmanowski -# Copyright (C) 2015-2019 DebOps -# SPDX-License-Identifier: GPL-3.0-only - -# Role: ipxe -# Package: netboot-stretch -# Version: 20170615+deb9u9 - -version=4 -https://deb.debian.org/debian/dists/stretch/main/installer-amd64 (20.+)/ From 63d7febbe2784c16af3441e5e4af9871c5da46e7 Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Thu, 15 Feb 2024 17:35:40 +0100 Subject: [PATCH 2/3] [ipxe] Update Debian Bullseye, Bookworm installers --- CHANGELOG.rst | 7 ++++ ansible/roles/ipxe/defaults/main.yml | 32 +++++++++---------- .../roles/ipxe/meta/watch-firmware-bookworm | 2 +- .../roles/ipxe/meta/watch-firmware-bullseye | 2 +- .../roles/ipxe/meta/watch-netboot-bookworm | 2 +- .../roles/ipxe/meta/watch-netboot-bullseye | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 13ab81be7a..2cd111ef1b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -51,6 +51,13 @@ General Changed ~~~~~~~ +Updates of upstream application versions +'''''''''''''''''''''''''''''''''''''''' + +- In the :ref:`debops.ipxe` role, support for the Debian Bullseye netboot + installer has been updated to v11.10; the Debian Bookworm installer has been + updated to v12.5. + :ref:`debops.elasticsearch` role '''''''''''''''''''''''''''''''' diff --git a/ansible/roles/ipxe/defaults/main.yml b/ansible/roles/ipxe/defaults/main.yml index 21bfd706f6..9aed226757 100644 --- a/ansible/roles/ipxe/defaults/main.yml +++ b/ansible/roles/ipxe/defaults/main.yml @@ -145,36 +145,36 @@ ipxe__debian_netboot_default_release_map: - name: 'bullseye-amd64' release: 'bullseye' architecture: 'amd64' - netboot_version: '20210731+deb11u8' - netboot_checksum: 'sha256:59233e074ff44edf763c0a851a08a163240a97d95118da89210bc77277774bf9' # netboot.tar.gz - firmware_version: '20230429' - firmware_checksum: 'sha256:af07b888fb8d5153b3448fa84c3a25307a7de9ec643196031dde975d6d8d9bce' # firmware.cpio.gz + netboot_version: '20210731+deb11u10' + netboot_checksum: 'sha256:4041076bae75b2ddb891d178878b57ad00edf101c905c726f605110130e256d2' # netboot.tar.gz + firmware_version: '20240210' + firmware_checksum: 'sha256:c4da5ed43aade331d2ee7a959ece87e2eebd08a90e8ca3fd40c3a5c445dd4313' # firmware.cpio.gz - name: 'bullseye-amd64-gtk' release: 'bullseye' architecture: 'amd64' netboot_subdir: '/gtk' - netboot_version: '20210731+deb11u8' - netboot_checksum: 'sha256:6fa4393276e95599a9a6c368f3a402c9b94f79aa3be3468acde4bfae91d0dad9' # netboot.tar.gz - firmware_version: '20230429' - firmware_checksum: 'sha256:af07b888fb8d5153b3448fa84c3a25307a7de9ec643196031dde975d6d8d9bce' # firmware.cpio.gz + netboot_version: '20210731+deb11u10' + netboot_checksum: 'sha256:93e9faa9a7b6360d31cc5d86c61f43a678285223ee7d46014dd9afcc5720842d' # netboot.tar.gz + firmware_version: '20240210' + firmware_checksum: 'sha256:c4da5ed43aade331d2ee7a959ece87e2eebd08a90e8ca3fd40c3a5c445dd4313' # firmware.cpio.gz - name: 'bookworm-amd64' release: 'bookworm' architecture: 'amd64' - netboot_version: '20230607+deb12u2' - netboot_checksum: 'sha256:9cadfcc3ed0e75b91ebb19306f19f83132ec76c4d115995296d55f4b59241c7b' # netboot.tar.gz - firmware_version: '20231007' - firmware_checksum: 'sha256:35ab001226f7256b6b5a952eda92ac54291313a9bdc1d09258345177b64d4df8' # firmware.cpio.gz + netboot_version: '20230607+deb12u5' + netboot_checksum: 'sha256:9ae301b2f6b31d6c94ca0a46b6428b550bd84416113e34054cd9167033e2c18b' # netboot.tar.gz + firmware_version: '20240210' + firmware_checksum: 'sha256:f793903fbc94328d28babe4bebc17dbc2d4e4a8cc0765dca23fed9c61f386232' # firmware.cpio.gz - name: 'bookworm-amd64-gtk' release: 'bookworm' architecture: 'amd64' netboot_subdir: '/gtk' - netboot_version: '20230607+deb12u2' - netboot_checksum: 'sha256:cae6ae3b6b6f86d4c02408beb16f2b15517ef46bbcc8b4282e792d33538f170c' # netboot.tar.gz - firmware_version: '20231007' - firmware_checksum: 'sha256:35ab001226f7256b6b5a952eda92ac54291313a9bdc1d09258345177b64d4df8' # firmware.cpio.gz + netboot_version: '20230607+deb12u5' + netboot_checksum: 'sha256:5ef80e1c38124aaa89aa3dd4d5f168bc7ac62cab63319a12907f7f0aead1447f' # netboot.tar.gz + firmware_version: '20240210' + firmware_checksum: 'sha256:f793903fbc94328d28babe4bebc17dbc2d4e4a8cc0765dca23fed9c61f386232' # firmware.cpio.gz # ]]] # .. envvar:: ipxe__debian_netboot_release_map [[[ diff --git a/ansible/roles/ipxe/meta/watch-firmware-bookworm b/ansible/roles/ipxe/meta/watch-firmware-bookworm index 14459fa182..be1b826488 100644 --- a/ansible/roles/ipxe/meta/watch-firmware-bookworm +++ b/ansible/roles/ipxe/meta/watch-firmware-bookworm @@ -4,7 +4,7 @@ # Role: ipxe # Package: firmware-bookworm -# Version: 20231007 +# Version: 20240210 version=4 https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/bookworm (20.+)/ diff --git a/ansible/roles/ipxe/meta/watch-firmware-bullseye b/ansible/roles/ipxe/meta/watch-firmware-bullseye index 2b4a409fb7..1ebc690933 100644 --- a/ansible/roles/ipxe/meta/watch-firmware-bullseye +++ b/ansible/roles/ipxe/meta/watch-firmware-bullseye @@ -4,7 +4,7 @@ # Role: ipxe # Package: firmware-bullseye -# Version: 20230429 +# Version: 20240210 version=4 https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/bullseye (20.+)/ diff --git a/ansible/roles/ipxe/meta/watch-netboot-bookworm b/ansible/roles/ipxe/meta/watch-netboot-bookworm index 6c57815785..37d81a8945 100644 --- a/ansible/roles/ipxe/meta/watch-netboot-bookworm +++ b/ansible/roles/ipxe/meta/watch-netboot-bookworm @@ -4,7 +4,7 @@ # Role: ipxe # Package: netboot-bookworm -# Version: 20230607+deb12u2 +# Version: 20230607+deb12u5 version=4 https://deb.debian.org/debian/dists/bookworm/main/installer-amd64 (20.+)/ diff --git a/ansible/roles/ipxe/meta/watch-netboot-bullseye b/ansible/roles/ipxe/meta/watch-netboot-bullseye index 5910bd4571..bd6ef2507f 100644 --- a/ansible/roles/ipxe/meta/watch-netboot-bullseye +++ b/ansible/roles/ipxe/meta/watch-netboot-bullseye @@ -4,7 +4,7 @@ # Role: ipxe # Package: netboot-bullseye -# Version: 20210731+deb11u8 +# Version: 20210731+deb11u10 version=4 https://deb.debian.org/debian/dists/bullseye/main/installer-amd64 (20.+)/ From 1186ddbe13ef8391c92cd47c76b5410656fabcde Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Fri, 16 Feb 2024 11:12:57 +0100 Subject: [PATCH 3/3] [debconf] Add missing COPYRIGHT file --- ansible/roles/debconf/COPYRIGHT | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 ansible/roles/debconf/COPYRIGHT diff --git a/ansible/roles/debconf/COPYRIGHT b/ansible/roles/debconf/COPYRIGHT new file mode 100644 index 0000000000..5a9f37c757 --- /dev/null +++ b/ansible/roles/debconf/COPYRIGHT @@ -0,0 +1,19 @@ +debops.debconf - Configure APT packages using Debconf database + +Copyright (C) 2024 Maciej Delmanowski +Copyright (C) 2024 DebOps +SPDX-License-Identifier: GPL-3.0-or-later + +This Ansible role is part of DebOps. + +DebOps is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 3, as +published by the Free Software Foundation. + +DebOps is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with DebOps. If not, see https://www.gnu.org/licenses/.