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)