Skip to content

Commit 51c6878

Browse files
authored
Merge pull request #721 from stackhpc/image_cloud_init_c9s
Rebuild Rocky Linux 9 image with missing packages and newer cloud-init
2 parents a2d8885 + c1aec3e commit 51c6878

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

etc/kayobe/overcloud-dib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ overcloud_dib_host_packages_extra:
7171
overcloud_dib_git_elements_extra:
7272
- repo: "https://github.com/stackhpc/stackhpc-image-elements"
7373
local: "{{ source_checkout_path }}/stackhpc-image-elements"
74-
version: "v1.5.0"
74+
version: "v1.6.0"
7575
elements_path: "elements"
7676

7777
# List of git repositories containing Diskimage Builder (DIB) elements. See

etc/kayobe/pulp-host-image-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# These images must be in SMS, since they are used by our AIO CI runners
44
stackhpc_centos_8_stream_overcloud_host_image_version: "yoga-20230525T095243"
55
stackhpc_rocky_8_overcloud_host_image_version: "yoga-20230629T135322"
6-
stackhpc_rocky_9_overcloud_host_image_version: "yoga-20231012T121552"
6+
stackhpc_rocky_9_overcloud_host_image_version: "yoga-20231026T081556"
77
stackhpc_ubuntu_focal_overcloud_host_image_version: "yoga-20230609T120720"
88
stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20231012T121552"

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ stackhpc_overcloud_dib_name: "deployment_image"
2121

2222
# StackHPC overcloud DIB image elements.
2323
stackhpc_overcloud_dib_elements:
24-
- "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container{% else %}minimal{% endif %}"
24+
- "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}"
2525
- "cloud-init-datasources"
2626
- "{% if os_distribution in ['centos', 'rocky'] %}disable-selinux{% endif %}"
2727
- "enable-serial-console"
@@ -41,6 +41,7 @@ stackhpc_overcloud_dib_env_vars:
4141
DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
4242
DIB_CONTAINERFILE_RUNTIME: "docker"
4343
DIB_CONTAINERFILE_NETWORK_DRIVER: "host"
44+
DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc"
4445
# NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in
4546
# Ark does not work if the upstream mirror pulls packages (which it does
4647
# sometimes).
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
features:
3+
- |
4+
Rocky Linux 9 image has been rebuilt with missing base packages (e.g.
5+
microcode_ctl) by installing 'Minimal Install' DNF group.
6+
Also cloud-init from CentOS 9 Stream has been installed with NetworkManager
7+
support.

0 commit comments

Comments
 (0)