From 5aa48ed208d69b5ddd43f411707959474d549094 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Mon, 9 Dec 2024 16:13:49 +0100 Subject: [PATCH 1/4] add grub timeout and OpenStack data srouce --- etc/kayobe/stackhpc-overcloud-dib.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index fda22fdfe..8dbe72d73 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -37,7 +37,9 @@ stackhpc_overcloud_dib_elements: stackhpc_overcloud_dib_env_vars: DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}" DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto" - DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" + DIB_GRUB_TIMEOUT: "5" + DIB_GRUB_TIMEOUT_STYLE: "countdown" + DIB_CLOUD_INIT_DATASOURCES: "OpenStack, 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" From 4c2901766ff4627eb217d8ffdeaddf2458659527 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Thu, 12 Dec 2024 10:26:18 +0100 Subject: [PATCH 2/4] changed timeout style to menu --- etc/kayobe/stackhpc-overcloud-dib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 8dbe72d73..99f5ae836 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -38,7 +38,7 @@ stackhpc_overcloud_dib_env_vars: DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}" DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto" DIB_GRUB_TIMEOUT: "5" - DIB_GRUB_TIMEOUT_STYLE: "countdown" + DIB_GRUB_TIMEOUT_STYLE: "menu" DIB_CLOUD_INIT_DATASOURCES: "OpenStack, ConfigDrive" DIB_CONTAINERFILE_RUNTIME: "docker" DIB_CONTAINERFILE_NETWORK_DRIVER: "host" From 63f4b135fbad52062b9cb29f02e0d1caea04d964 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Thu, 16 Jan 2025 13:54:23 +0100 Subject: [PATCH 3/4] add reno --- .../notes/grub_timeout_values-c39b8b1a2c34a602.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/grub_timeout_values-c39b8b1a2c34a602.yaml diff --git a/releasenotes/notes/grub_timeout_values-c39b8b1a2c34a602.yaml b/releasenotes/notes/grub_timeout_values-c39b8b1a2c34a602.yaml new file mode 100644 index 000000000..7c7060d8e --- /dev/null +++ b/releasenotes/notes/grub_timeout_values-c39b8b1a2c34a602.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + Change default values for ``DIB_GRUB_TIMEOUT_STYLE`` and + ``DIB_GRUB_TIMEOUT``. The default value for ``DIB_GRUB_TIMEOUT_STYLE`` + will be ``menu`` and for ``DIB_GRUB_TIMEOUT`` will be ``5``. + Adding ConfigDrive to ``DIB_CLOUD_INIT_DATASOURCES`` var list to fix + cloud-init issue. From 276648c8ae1458c1bbbc07bc9ae11329c591909f Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Thu, 16 Jan 2025 15:08:35 +0100 Subject: [PATCH 4/4] update overcloud_host_image_version --- etc/kayobe/pulp-host-image-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index 7e19ef2ec..5e4ef717a 100644 --- a/etc/kayobe/pulp-host-image-versions.yml +++ b/etc/kayobe/pulp-host-image-versions.yml @@ -1,5 +1,5 @@ --- # Overcloud host image versioning tags # These images must be in SMS, since they are used by our AIO CI runners -stackhpc_rocky_9_overcloud_host_image_version: "2024.1-20240912T145502" -stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20240911T124950" +stackhpc_rocky_9_overcloud_host_image_version: "2024.1-20241209T151515" +stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20250116T133659"