From 6039d0e1ed8ea2a11ffb256e9d486cbb855a60e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Iv=C3=A1n=20L=C3=B3pez=20Gonz=C3=A1lez?= Date: Tue, 25 Jul 2023 16:07:49 +0100 Subject: [PATCH 1/3] [service] Adapt config file --- service/etc/agama.yaml | 110 ++++++----------------------------------- 1 file changed, 14 insertions(+), 96 deletions(-) diff --git a/service/etc/agama.yaml b/service/etc/agama.yaml index b2a014c9f7..1961c7b833 100644 --- a/service/etc/agama.yaml +++ b/service/etc/agama.yaml @@ -1,13 +1,7 @@ products: - ALP-Bedrock: - name: SUSE ALP Server - description: 'SUSE ALP Server is a flexible, secure, customizable and - modular Server allowing an enterprise to run a variety of services, - workloads and application in a compartmentalized form. Based on an - immutable root filesystem, security has been built into it from the ground.' - ALP-Micro: - name: SUSE ALP Micro - description: 'SUSE ALP Micro is a minimum immutable OS core, focused on + ALP-Dolomite: + name: SUSE ALP Dolomite + description: 'SUSE ALP Dolomite is a minimum immutable OS core, focused on security to provide the bare minimum to run workloads and services as containers or virtual machines.' Tumbleweed: @@ -143,99 +137,23 @@ Tumbleweed: proposed_configurable: true disable_order: 2 -ALP-Bedrock: +ALP-Dolomite: software: installation_repositories: - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Bedrock:/0.1/images/repo/ALP-Bedrock-0.1-x86_64-Media1/ + - url: https://updates.suse.com/SUSE/Products/ALP-Dolomite/1.0/x86_64/product/ archs: x86_64 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Bedrock:/0.1/images/repo/ALP-Bedrock-0.1-aarch64-Media1/ + - url: https://updates.suse.com/SUSE/Products/ALP-Dolomite/1.0/aarch64/product/ archs: aarch64 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Bedrock:/0.1/images/repo/ALP-Bedrock-0.1-s390x-Media1/ + - url: https://updates.suse.com/SUSE/Products/ALP-Dolomite/1.0/s390x/product/ archs: s390 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Bedrock:/0.1/images/repo/ALP-Bedrock-0.1-ppc64le-Media1/ + - url: https://updates.suse.com/SUSE/Products/ALP-Dolomite/1.0/ppc64le/product/ archs: ppc mandatory_patterns: - - alp-bedrock-base - - alp-bedrock-cockpit - - alp-bedrock-hardware - - alp-bedrock-container_runtime - optional_patterns: null # no optional pattern shared - mandatory_packages: - - package: device-mapper # Apparently needed if devices at /dev/mapper are used at boot (eg. FDE) - - package: fde-tools # Needed for FDE with TPM, hardcoded here temporarily (aarch64, x86_64 specific) - archs: aarch64, x86_64 - - package: libtss2-tcti-device0 # Same than fde-tools - optional_packages: null - base_product: ALP-Bedrock - - security: - tpm_luks_open: true - lsm: selinux - available_lsms: - # apparmor: - # patterns: - # - apparmor - selinux: - patterns: - - alp-bedrock-selinux - policy: enforcing - none: - patterns: null - - storage: - encryption: - method: luks2 - pbkdf: pbkdf2 - volumes: - - mount_point: "/" - fs_type: btrfs - min_size: 5 GiB - fs_types: - - btrfs - weight: 1 - snapshots: true - snapshots_configurable: false - proposed_configurable: false - btrfs_default_subvolume: "@" - btrfs_read_only: true - subvolumes: - - path: root - - path: home - - path: opt - - path: srv - - path: boot/writable - - path: usr/local - - path: boot/grub2/arm64-efi - archs: aarch64 - - path: boot/grub2/i386-pc - archs: x86_64 - - path: boot/grub2/powerpc-ieee1275 - archs: ppc,!board_powernv - - path: boot/grub2/s390x-emu - archs: s390 - - path: boot/grub2/x86_64-efi - archs: x86_64 - - path: var - copy_on_write: false - -ALP-Micro: - software: - installation_repositories: - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Micro:/0.1/images/repo/ALP-Micro-0.1-x86_64-Media1/ - archs: x86_64 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Micro:/0.1/images/repo/ALP-Micro-0.1-aarch64-Media1/ - archs: aarch64 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Micro:/0.1/images/repo/ALP-Micro-0.1-s390x-Media1/ - archs: s390 - - url: https://download.opensuse.org/repositories/SUSE:/ALP:/Products:/Micro:/0.1/images/repo/ALP-Micro-0.1-ppc64le-Media1/ - archs: ppc - - mandatory_patterns: - - alp-micro-base - - alp-micro-cockpit - - alp-micro-container_runtime - - alp-micro-hardware + - patterns-alp-base + - patterns-alp-cockpit + - patterns-alp-container_runtime + - patterns-alp-hardware optional_patterns: null # no optional pattern shared mandatory_packages: - package: device-mapper # Apparently needed if devices at /dev/mapper are used at boot (eg. FDE) @@ -243,7 +161,7 @@ ALP-Micro: archs: aarch64, x86_64 - package: libtss2-tcti-device0 # Same than fde-tools optional_packages: null - base_product: ALP-Micro + base_product: ALP-Dolomite security: tpm_luks_open: true @@ -254,7 +172,7 @@ ALP-Micro: # - apparmor selinux: patterns: - - alp-micro-selinux + - patterns-alp-selinux policy: enforcing none: patterns: null From dc6c00f7f5fd6ce82eab249b27cc925f6850c925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Iv=C3=A1n=20L=C3=B3pez=20Gonz=C3=A1lez?= Date: Wed, 26 Jul 2023 11:02:30 +0100 Subject: [PATCH 2/3] [service] Changelog --- service/package/rubygem-agama.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama.changes index 5bdcc703c4..035d15fc98 100644 --- a/service/package/rubygem-agama.changes +++ b/service/package/rubygem-agama.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 26 10:00:39 UTC 2023 - José Iván López González + +- Adapt config file to install ALP Dolomite instead of ALP Micro + and remove ALP Bedrock (gh#openSUSE/agama#674). + ------------------------------------------------------------------- Mon Jul 17 09:16:38 UTC 2023 - Josef Reidinger From f927585120a9c8b9d2725b1c806753bf6f2d0b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Iv=C3=A1n=20L=C3=B3pez=20Gonz=C3=A1lez?= Date: Thu, 27 Jul 2023 09:04:25 +0100 Subject: [PATCH 3/3] [service] Do not install container_runtime pattern - The following list is not include in Dolomite repos: patterns-alp-kvm_host, patterns-alp-sssd_ldap, patterns-alp-container_runtime, patterns-alp-fips. --- service/etc/agama.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/service/etc/agama.yaml b/service/etc/agama.yaml index 1961c7b833..a867b62b59 100644 --- a/service/etc/agama.yaml +++ b/service/etc/agama.yaml @@ -152,7 +152,6 @@ ALP-Dolomite: mandatory_patterns: - patterns-alp-base - patterns-alp-cockpit - - patterns-alp-container_runtime - patterns-alp-hardware optional_patterns: null # no optional pattern shared mandatory_packages: