From bf9ade666cb777b901e7f9092b8ac8e34368bfc2 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 27 Jun 2026 20:41:02 +0200 Subject: [PATCH] Align os_distro schema values with Glance docs Match the os_distro enum in the schema with the values documented at https://docs.openstack.org/glance/latest/admin/useful-image-properties: add the missing documented values (notably 'rocky', plus 'gentoo', 'mandrake', 'mandriva', 'mes', 'msdos', 'netbsd', 'netware', 'openbsd', 'opensolaris', 'sled') and drop the undocumented, unused 'clearlinux'. 'cirros' and 'talos' are kept because they are used by existing image definitions and have no official os_distro value. Now that 'rocky' is permitted, switch the Rocky Linux images from the 'centos' workaround to 'rocky'. Closes #1105 Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Christian Berendt --- etc/images/rockylinux.yml | 4 ++-- etc/schema.yaml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/images/rockylinux.yml b/etc/images/rockylinux.yml index 0acabc03..d4418327 100644 --- a/etc/images/rockylinux.yml +++ b/etc/images/rockylinux.yml @@ -17,7 +17,7 @@ images: hw_scsi_model: virtio-scsi hw_watchdog_action: reset hypervisor_type: qemu - os_distro: centos + os_distro: rocky os_version: '8' os_purpose: generic replace_frequency: quarterly @@ -54,7 +54,7 @@ images: hw_scsi_model: virtio-scsi hw_watchdog_action: reset hypervisor_type: qemu - os_distro: centos + os_distro: rocky os_version: '9' os_purpose: generic replace_frequency: quarterly diff --git a/etc/schema.yaml b/etc/schema.yaml index 1071ad8e..abb77485 100644 --- a/etc/schema.yaml +++ b/etc/schema.yaml @@ -35,7 +35,10 @@ meta: hw_watchdog_action: enum('disabled', 'reset', 'poweroff', 'pause', 'none', required=False) hypervisor_type: enum('hyperv', 'ironic', 'lxc', 'qemu', 'uml', 'vmware', 'xen') image_description: str(required=False) - os_distro: enum('arch', 'centos', 'cirros', 'clearlinux', 'debian', 'fedora', 'freebsd', 'opensuse', 'rhel', 'talos', 'ubuntu', 'windows') + # Permissible values as documented for the os_distro property + # (https://docs.openstack.org/glance/latest/admin/useful-image-properties), + # extended with 'cirros' and 'talos' for which no official value exists. + os_distro: enum('arch', 'centos', 'cirros', 'debian', 'fedora', 'freebsd', 'gentoo', 'mandrake', 'mandriva', 'mes', 'msdos', 'netbsd', 'netware', 'openbsd', 'opensolaris', 'opensuse', 'rhel', 'rocky', 'sled', 'talos', 'ubuntu', 'windows') os_version: str(required=False) os_purpose: enum('generic', 'minimal', 'k8snode', 'gpu', 'network', 'custom') patchlevel: str(required=False)