diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index 82c01134b..8f59d58ef 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -71,7 +71,7 @@ overcloud_dib_host_packages_extra: overcloud_dib_git_elements_extra: - repo: "https://github.com/stackhpc/stackhpc-image-elements" local: "{{ source_checkout_path }}/stackhpc-image-elements" - version: "v1.5.0" + version: "v1.6.0" elements_path: "elements" # List of git repositories containing Diskimage Builder (DIB) elements. See diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index c58299f3e..1c421a52a 100644 --- a/etc/kayobe/pulp-host-image-versions.yml +++ b/etc/kayobe/pulp-host-image-versions.yml @@ -3,6 +3,6 @@ # These images must be in SMS, since they are used by our AIO CI runners stackhpc_centos_8_stream_overcloud_host_image_version: "yoga-20230525T095243" stackhpc_rocky_8_overcloud_host_image_version: "yoga-20230629T135322" -stackhpc_rocky_9_overcloud_host_image_version: "yoga-20231012T121552" +stackhpc_rocky_9_overcloud_host_image_version: "yoga-20231026T081556" stackhpc_ubuntu_focal_overcloud_host_image_version: "yoga-20230609T120720" stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20231012T121552" diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 3ed4d44db..fcce90746 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -21,7 +21,7 @@ stackhpc_overcloud_dib_name: "deployment_image" # StackHPC overcloud DIB image elements. stackhpc_overcloud_dib_elements: - - "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container{% else %}minimal{% endif %}" + - "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}" - "cloud-init-datasources" - "{% if os_distribution in ['centos', 'rocky'] %}disable-selinux{% endif %}" - "enable-serial-console" @@ -41,6 +41,7 @@ stackhpc_overcloud_dib_env_vars: DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" DIB_CONTAINERFILE_RUNTIME: "docker" DIB_CONTAINERFILE_NETWORK_DRIVER: "host" + DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc" # NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in # Ark does not work if the upstream mirror pulls packages (which it does # sometimes). diff --git a/releasenotes/notes/rl9-image-minimal-cloud-init-83576172be8febca.yaml b/releasenotes/notes/rl9-image-minimal-cloud-init-83576172be8febca.yaml new file mode 100644 index 000000000..ea3ee865e --- /dev/null +++ b/releasenotes/notes/rl9-image-minimal-cloud-init-83576172be8febca.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Rocky Linux 9 image has been rebuilt with missing base packages (e.g. + microcode_ctl) by installing 'Minimal Install' DNF group. + Also cloud-init from CentOS 9 Stream has been installed with NetworkManager + support.