nova05: follow up changes

[bogdando]

• Add cross-site routes/GWs

  For all nova05epsilon's NADs, NetConfig subnets, host-level NNCP routes add missing cross-site DCN routes,
  and gateways.

  Previsourely those were tested in ci-framework jobs overlays but the base DT example was missing those
  CHANGEME templates.

• Add SNO Swift fix hook for Ceph RGW

• Ext net for tests accessing VMs via FIP

  Add external NAD definition with VLAN to DT nncp/values.yaml.
  Update scenario-vars.yaml with external NAD for Tempest access to FIP.

• Add automation mocks for CI

• Fix telemetry spec and kustomize chain for SNO

  The DT-level kustomization was missing service-values replacements
  (telemetry, nova, glance, ovn, extraMounts), so the examples kustomize
  build produced base defaults instead of DT-specific config. This caused
  metricStorage.enabled=false and missing alertmanagerConfig on the
  deployed OSCP.

  Additionally, pvcStorageClass was hardcoded to "local-storage" but SNO
  uses LVMS ("lvms-local-storage"), and alertmanager defaulted to 2
  replicas which cannot schedule on a single node due to required
  pod anti-affinity.

• Align the kustomization layers with nova04delta:

  • dt/nova/nova05epsilon/kustomization.yaml: add service-values
    replacements matching nova04delta pattern
  • Remove deplicated replacements for
    dt/nova/nova05epsilon/control-plane/kustomization.yaml
  • examples/.../control-plane/service-values.yaml: add full DT-specific
    data (telemetry, nova, glance, ovn, extraMounts)
  • Set pvcStorageClass to lvms-local-storage and alertmanagerConfig
    replicas to 1 for SNO compatibility
  • update control-plane.md

• Separate pre and post ceph OSCP configs

  HCI uses edpm post ceph to also patch the OSCP which looks suboptimal.

  Separate this into a two steps:

  • make post-ceph nodeset layer handling EDPM resources only (NodeSet,
    Services, Secrets, ConfigMap) - remove OSCP layer resources
  • add control-plane-post-ceph layer for OSCP with Glance RBD + Ceph
    extraMounts and secret config. Instead of re-including lib/control-plane
    (which required network-values duplication)
    provide only required values for lib/control-plane/base.
  • update README.md stages list from 4 to 6 steps, automation step
    count from 9 to 10
  • add note for defferred Ceph config for control-plane.md
  • add control-plane post-ceph doc for the dedicated Ceph
    control-plane update stage
  • remove control-plane update references for
    dataplane-post-ceph.md, add prerequisite for
    control-plane-post-ceph
  • add control-plane-post-ceph stage between pre-ceph deployment and
    post-ceph nodeset ini automation vars

Depends-on: openstack-k8s-operators/ci-framework#3773
Related: OSPRH-30706

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/748123c85aff449bbb63c8ec67a2a576

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 10s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/562686cbdf7d4c7eaa0d291a61b28ee8

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 3m 54s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/3bc80cde7ec544b9ae1c3c5e6ecee80a

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 04s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/30d9674ca6024d4c9a9f6e49b146629a

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 04s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/44007c1c904d448dad27bbdda99d79ef

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 48s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/45ec0f2752f549cca4bd5da30b14c175

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 40s

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/4de996b4280645dc8717c425be0814ab

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 16s

[fultonj]

Perhaps add depends-on: https://github.com/openstack-k8s-operators/ci-framework/pull/3773?

We cannot merge this until the above provides ../../hooks/playbooks/fix_swift_endpoint.yml

[bogdando]

Finally works with my local testing

[bogdando]

downstream testing completed for this DT and dependency patches, it is good to go

[evallesp]

/lgtm

[centosinfra-prod-github-app]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/9419fc3e879947b5845fee2b24cbee92

✔️ noop SUCCESS in 0s
❌ rhoso-architecture-validate-nova05epsilon FAILURE in 4m 32s

[bogdando]

@abays the deduplication patch worked for my testing

[fultonj]

It looks like automation/vars/nova05epsilon.yaml was manually edited and the file consistency CI caught it.

I recommend re-generating it with create-zuul-jobs.py and then re-submitting.

zuul.d/base-jobs.yaml: OK
zuul.d/projects.yaml: OK
sha256sum: WARNING: 1 computed checksum did NOT match
zuul.d/validations.yaml: FAILED
diff --git a/zuul.d/validations.yaml b/zuul.d/validations.yaml
index f451462..b611f49 100644
--- a/zuul.d/validations.yaml
+++ b/zuul.d/validations.yaml
@@ -310,7 +310,6 @@
     - automation/mocks/nova05epsilon.yaml
     - automation/net-env/nova05epsilon.yaml
     - examples/dt/nova/nova05epsilon
-    - examples/dt/nova/nova05epsilon/network-values
     - examples/dt/nova/nova05epsilon/control-plane
     - examples/dt/nova/nova05epsilon/control-plane-post-ceph
     - examples/dt/nova/nova05epsilon/control-plane/networking

[fultonj]

Nice working on factoring out the post-ceph CRs so you have a post-ceph control plane!

Before

[johfulto@laptop current{nova05epsilon}]$ wc -l nova05epsilon-edpm-post-ceph.yaml
833 nova05epsilon-edpm-post-ceph.yaml
[johfulto@laptop current{nova05epsilon}]$ grep kind nova05epsilon-edpm-post-ceph.yaml
kind: ConfigMap
kind: Secret
kind: Secret
kind: Secret
kind: Secret
kind: Secret
kind: OpenStackControlPlane
kind: OpenStackDataPlaneNodeSet
kind: OpenStackDataPlaneService
kind: OpenStackDataPlaneService
[johfulto@laptop current{nova05epsilon}]$ 

After:

[johfulto@laptop proposed{nova05epsilon}]$ wc -l nova05epsilon-control-plane-post-ceph.yaml nova05epsilon-edpm-post-ceph.yaml
  573 nova05epsilon-control-plane-post-ceph.yaml
  274 nova05epsilon-edpm-post-ceph.yaml
  847 total
[johfulto@laptop proposed{nova05epsilon}]$ grep kind nova05epsilon-control-plane-post-ceph.yaml
kind: Secret
kind: Secret
kind: OpenStackControlPlane
[johfulto@laptop proposed{nova05epsilon}]$ grep kind nova05epsilon-edpm-post-ceph.yaml
kind: ConfigMap
kind: Secret
kind: Secret
kind: Secret
kind: Secret
kind: OpenStackDataPlaneNodeSet
kind: OpenStackDataPlaneService
kind: OpenStackDataPlaneService
[johfulto@laptop proposed{nova05epsilon}]$ 

[fultonj]

/lgtm

[fultonj]

/lgtm

[fultonj]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bogdando, evallesp, fultonj

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:

• OWNERS [fultonj]

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

[centosinfra-prod-github-app]

Build succeeded (gate pipeline).
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/fd29450399b249f6987ba078f94ed2d1

✔️ noop SUCCESS in 0s
✔️ rhoso-architecture-validate-nova05epsilon SUCCESS in 5m 33s