Skip to content

[fr4] Adjust nova04delta T-O, add DNS and BMO layers#662

Merged
softwarefactory-project-zuul[bot] merged 1 commit intoopenstack-k8s-operators:18.0-fr4from
bogdando:18.0-fr4
Dec 1, 2025
Merged

[fr4] Adjust nova04delta T-O, add DNS and BMO layers#662
softwarefactory-project-zuul[bot] merged 1 commit intoopenstack-k8s-operators:18.0-fr4from
bogdando:18.0-fr4

Conversation

@bogdando
Copy link
Copy Markdown
Contributor

@bogdando bogdando commented Nov 28, 2025

  1. Add DNS config and ctlplane NAD for T-O

When T-O uses ctlplane net for metrics scrapping on EDPM hosts, additional Openshift DNS servers must be added to let it resolving FQDN of EDPM hosts on controlplane network. Note that cifmw addresses this differently, however, nova04delta is also used outside of cifmw.

Enable metricStorage/dashboard.
Also, as documented for T-O, add ctlplane NAD for metrics storage template spec in oscp CR.

  1. Simplify bmh kustzomiation and extract BMO into a separate kustomization for allowing it in parallel steps in CI.

Create a separate kustomization for BMH and provisioning to make it applicable independently of nodeset.

Adjust automation to create CP and BMH in parallel.

The stages will now execute as follows:

  1. nncp-configuration (networking setup)
  2. network-configuration (MetalLB setup)
  3. control-plane and baremetalhosts-configuration (run in parallel)
  4. edpm-nodeset (depends on both control plane and BMH being ready)
  5. edpm-deployment (final deployment)
  1. Align nvidia-vfio VA with underlying DT changes

  2. nova04/vfio: fix storage class overriding

The storage lib component relies on network-values data for setting control plane SC values, historically. The replacement of telemetry data overrides this in the nova04delta and vfio DT/VA.

Fixing that by re-applying the storage component logic locally in the DT/VA as well, while repurposing it to control-plane data instead of network-values didn't work in CI (however, it works locally with kustomize build).

Fix that by simply providing pvcStorageClass directly in DT/VA.

We would not have to fix that, if T-O had been taking the top scope storageClass for its metricStorage template (that fix will be in FR5 likely).

Unrelated change:

  • update gitignore for asdf .tool-versions to simplify local development when kustomize is installed with asdf.

CI impact: rework extracted BMO values for baremetalhosts-configuration

Jira: OSPRH-21650

1) Add DNS config and ctlplane NAD for T-O

When T-O uses ctlplane net for metrics scrapping on EDPM hosts,
additional Openshift DNS servers must be added to let it resolving
FQDN of EDPM hosts on controlplane network. Note that cifmw addresses
this differently, however, nova04delta is also used outside of cifmw.

Enable metricStorage/dashboard.
Also, as documented for T-O, add ctlplane NAD for metrics storage
template spec in oscp CR.

2) Simplify bmh kustzomiation and extract BMO into a separate
kustomization for allowing it in parallel steps in CI.

Create a separate kustomization for BMH and provisioning to make it
applicable independently of nodeset.

Adjust automation to create CP and BMH in parallel.

The stages will now execute as follows:
1. nncp-configuration (networking setup)
2. network-configuration (MetalLB setup)
3. control-plane and baremetalhosts-configuration (run in parallel)
4. edpm-nodeset (depends on both control plane and BMH being ready)
5. edpm-deployment (final deployment)

3) Align nvidia-vfio VA with underlying DT changes

4) nova04/vfio: fix storage class overriding

The storage lib component relies on network-values data for setting
control plane SC values, historically. The replacement of telemetry
data overrides this in the nova04delta and vfio DT/VA.

Fixing that by re-applying the storage component logic locally in the
DT/VA as well, while repurposing it to control-plane data instead of
network-values didn't work in CI (however, it works locally with
kustomize build).

Fix that by simply providing pvcStorageClass directly in DT/VA.

We would not have to fix that, if T-O had been taking the top scope
storageClass for its metricStorage template (that fix will be in FR5
likely).

Unrelated change:
* update gitignore for asdf .tool-versions to simplify local
development when kustomize is installed with asdf.

CI impact: rework extracted BMO values for baremetalhosts-configuration

Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
@openshift-ci openshift-ci Bot requested review from abays and fultonj November 28, 2025 10:57
@bogdando
Copy link
Copy Markdown
Contributor Author

note: this is a squashed cherry-pick of #661 and #655

Copy link
Copy Markdown
Contributor

@abays abays left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm label Dec 1, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Dec 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, bogdando

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved label Dec 1, 2025
@softwarefactory-project-zuul
Copy link
Copy Markdown
Contributor

@softwarefactory-project-zuul softwarefactory-project-zuul Bot merged commit 237103c into openstack-k8s-operators:18.0-fr4 Dec 1, 2025
4 checks passed
@bogdando bogdando deleted the 18.0-fr4 branch December 1, 2025 09:47
namespace: openstack
annotations:
inspect.metal3.io: _replaced_
inspect.metal3.io: ""
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YOu can get rid of this if you don't want inspection to be disabled. No point hardcoding iit.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to know, thanks! so it would work as default value?

@@ -0,0 +1,2 @@
username=admin
password=password No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing end of line

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants