From 4facbfce89546d023d2a9c923fffcc2d2e5de391 Mon Sep 17 00:00:00 2001 From: Kevin Quinn Date: Tue, 4 Jun 2024 12:42:52 +0100 Subject: [PATCH] OCPBUGS-34723 OpenShift cluster configuration for vDU application workloads needs update --- modules/ztp-du-host-firmware-requirements.adoc | 4 ++-- modules/ztp-sno-du-tuning-the-performance-patch.adoc | 2 -- snippets/ztp_99-sync-time-once-master.yaml | 3 ++- snippets/ztp_99-sync-time-once-worker.yaml | 2 +- snippets/ztp_TunedPerformancePatch.yaml | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/ztp-du-host-firmware-requirements.adoc b/modules/ztp-du-host-firmware-requirements.adoc index 6200472795..0bf6c574f1 100644 --- a/modules/ztp-du-host-firmware-requirements.adoc +++ b/modules/ztp-du-host-firmware-requirements.adoc @@ -12,14 +12,14 @@ Bare-metal hosts require the firmware to be configured before the host can be pr . Set the *UEFI/BIOS Boot Mode* to `UEFI`. . In the host boot sequence order, set *Hard drive first*. -. Apply the specific firmware configuration for your hardware. The following table describes a representative firmware configuration for an Intel Xeon Skylake or Intel Cascade Lake server, based on the Intel FlexRAN 4G and 5G baseband PHY reference design. +. Apply the specific firmware configuration for your hardware. The following table describes a representative firmware configuration for an Intel Xeon Skylake server and later hardware generations, based on the Intel FlexRAN 4G and 5G baseband PHY reference design. + [IMPORTANT] ==== The exact firmware configuration depends on your specific hardware and network requirements. The following sample configuration is for illustrative purposes only. ==== + -.Sample firmware configuration for an Intel Xeon Skylake or Cascade Lake server +.Sample firmware configuration [cols=2*, width="90%", options="header"] |==== |Firmware setting diff --git a/modules/ztp-sno-du-tuning-the-performance-patch.adoc b/modules/ztp-sno-du-tuning-the-performance-patch.adoc index 3855f4dff1..8bf6e4fe74 100644 --- a/modules/ztp-sno-du-tuning-the-performance-patch.adoc +++ b/modules/ztp-sno-du-tuning-the-performance-patch.adoc @@ -23,6 +23,4 @@ include::snippets/ztp_TunedPerformancePatch.yaml[] |`spec.profile.data` a|* The `include` line that you set in `spec.profile.data` must match the associated `PerformanceProfile` CR name. For example, `include=openshift-node-performance-${PerformanceProfile.metadata.name}`. - -* When using the non-realtime kernel, remove the `timer_migration override` line from the `[sysctl]` section. |==== diff --git a/snippets/ztp_99-sync-time-once-master.yaml b/snippets/ztp_99-sync-time-once-master.yaml index 0b54015852..5195ba9fb8 100644 --- a/snippets/ztp_99-sync-time-once-master.yaml +++ b/snippets/ztp_99-sync-time-once-master.yaml @@ -13,7 +13,8 @@ spec: - contents: | [Unit] Description=Sync time once - After=network.service + After=network-online.target + Wants=network-online.target [Service] Type=oneshot TimeoutStartSec=300 diff --git a/snippets/ztp_99-sync-time-once-worker.yaml b/snippets/ztp_99-sync-time-once-worker.yaml index 59c6b9a646..2675a637ed 100644 --- a/snippets/ztp_99-sync-time-once-worker.yaml +++ b/snippets/ztp_99-sync-time-once-worker.yaml @@ -13,7 +13,7 @@ spec: - contents: | [Unit] Description=Sync time once - After=network.service + After=network-online.target [Service] Type=oneshot TimeoutStartSec=300 diff --git a/snippets/ztp_TunedPerformancePatch.yaml b/snippets/ztp_TunedPerformancePatch.yaml index f7e8d90732..5e47d72b63 100644 --- a/snippets/ztp_TunedPerformancePatch.yaml +++ b/snippets/ztp_TunedPerformancePatch.yaml @@ -3,7 +3,8 @@ kind: Tuned metadata: name: performance-patch namespace: openshift-cluster-node-tuning-operator - annotations: {} + annotations: + ran.openshift.io/ztp-deploy-wave: "10" spec: profile: - name: performance-patch @@ -16,11 +17,10 @@ spec: [main] summary=Configuration changes profile inherited from performance created tuned include=openshift-node-performance-openshift-node-performance-profile - [sysctl] - kernel.timer_migration=1 [scheduler] group.ice-ptp=0:f:10:*:ice-ptp.* group.ice-gnss=0:f:10:*:ice-gnss.* + group.ice-dplls=0:f:10:*:ice-dplls.* [service] service.stalld=start,enable service.chronyd=stop,disable