Skip to content

Commit 31ad11a

Browse files
Merge pull request #764 from bogdando/nova05epsilon
nova05: follow up changes 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 Reviewed-by: Bogdan Dobrelya <bdobreli@redhat.com> Reviewed-by: John Fulton <johfulto@redhat.com> Reviewed-by: Enrique Vallespi Gil Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
2 parents 98f4af5 + 2e3234a commit 31ad11a

27 files changed

Lines changed: 1340 additions & 258 deletions
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
cifmw_install_ca_url: http://example.com/example.pem
3+
cifmw_repo_setup_rhos_release_rpm: http://example.com/rhos-release.rpm
4+
cifmw_repo_setup_rhos_release_args: example-args
5+
cifmw_ci_gen_kustomize_values_remove_keys_expressions:
6+
- ^node(_[0-9]+)?$
7+
cifmw_baremetal_hosts:
8+
compute-0:
9+
connection: idrac-virtualmedia://foo.example.com/redfish/v1/Systems/System.Embedded.1
10+
boot_mode: UEFI
11+
status: running
12+
nics:
13+
- mac: "aa:bb:cc:dd:ee:ff"
14+
network: provision
15+
root_device_hint: /dev/disk/by-path/pci-0000:65:00.0-scsi-0:1:234:5
16+
root_device_hint_field: deviceName
17+
credentials_file: "/home/zuul/idrac_access.yaml"
18+
nmstate:
19+
interfaces:
20+
- name: nic1
21+
type: ethernet
22+
state: up
23+
ipv4:
24+
enabled: true
25+
dhcp: true
26+
- name: nic2
27+
type: ethernet
28+
state: up
29+
ipv4:
30+
enabled: true
31+
address:
32+
- ip: 10.0.0.10
33+
prefix-length: 24
34+
dns-resolver:
35+
config:
36+
server:
37+
- 10.0.0.1
38+
routes:
39+
config:
40+
- destination: 0.0.0.0/0
41+
next-hop-address: 10.0.0.1
42+
next-hop-interface: nic1

0 commit comments

Comments
 (0)