Skip to content

Commit 321e26c

Browse files
bogdandoaider-chat-bot
bogdando
and
aider-chat-bot
committed
chore: Align bmh/pre-prov *NetworkData for nova04delta and nvidia-vfio-passthrough
Co-authored-by: aider (gemini/gemini-2.5-pro) <[email protected]> Signed-off-by: Bohdan Dobrelia <[email protected]>
1 parent 6e3f2ee commit 321e26c

File tree

7 files changed

+71
-62
lines changed

7 files changed

+71
-62
lines changed

‎examples/dt/nova/nova04delta/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ The following parameters are crucial for host-level configuration:
2020
* `bmc.address`: The IP address of the Baseboard Management Controller (BMC).
2121
* `bootMACAddress`: The MAC address of the network interface that the node will use to PXE boot.
2222
* `rootDeviceHints`: Hints for metal3 to identify the root device for the OS installation.
23-
* `preprovisioningNetworkData`: Network configuration to be applied to the node for provisioning.
23+
* `preprovisioningNetworkData`: Static nmstate network config to be applied to a `BaremetalHost` via ironic-python-agent ramdisk during provisioning. The config is embedded in the ISO attached as virtual media via the BMC, so no DHCP is required.
24+
* `baremetalHostsNetworkData`: Final nmstate network configuration for EDPM nodes.
2425

2526
* `edpm_kernel_args`: Appends necessary kernel arguments for VFIO passthrough.
2627
* `intel_iommu=on iommu=pt`: Enables the IOMMU for device passthrough.

‎examples/dt/nova/nova04delta/edpm/nodeset/values.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,9 @@ data:
2020
bootMACAddress: CHANGEME
2121
rootDeviceHints:
2222
deviceName: /dev/vda
23-
preprovisioningNetworkData: |
24-
networkData:
25-
links:
26-
- id: provisioning
27-
type: phy
28-
name: CHANGEME
29-
networks:
30-
- id: provisioning
31-
type: ipv4
32-
link: provisioning
33-
ip_address: 172.22.0.100 # CHANGEME
34-
netmask: 255.255.255.0
35-
routes:
36-
- destination: 0.0.0.0/0
37-
next_hop: 172.22.0.1 # CHANGEME
23+
preprovisioningNetworkData:
24+
nmstate: |
25+
CHANGEME
3826
baremetalHostsNetworkData:
3927
edpm-compute-0:
4028
networkData: |

‎examples/dt/nova/nova04delta/edpm/nodeset2/values.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,9 @@ data:
2020
bootMACAddress: CHANGEME
2121
rootDeviceHints:
2222
deviceName: /dev/vda
23-
preprovisioningNetworkData: |
24-
networkData:
25-
links:
26-
- id: provisioning
27-
type: phy
28-
name: CHANGEME
29-
networks:
30-
- id: provisioning
31-
type: ipv4
32-
link: provisioning
33-
ip_address: 172.22.0.101 # CHANGEME
34-
netmask: 255.255.255.0
35-
routes:
36-
- destination: 0.0.0.0/0
37-
next_hop: 172.22.0.1 # CHANGEME
23+
preprovisioningNetworkData:
24+
nmstate: |
25+
CHANGEME
3826
baremetalHostsNetworkData:
3927
edpm-compute-1:
4028
networkData: |

‎examples/va/nvidia-vfio-passthrough/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ The following parameters are crucial for host-level configuration:
3737
* `bmc.address`: The IP address of the Baseboard Management Controller (BMC).
3838
* `bootMACAddress`: The MAC address of the network interface that the node will use to PXE boot.
3939
* `rootDeviceHints`: Hints for metal3 to identify the root device for the OS installation.
40-
* `preprovisioningNetworkData`: Network configuration to be applied to the node for provisioning.
40+
* `preprovisioningNetworkData`: Static nmstate network config to be applied to a `BaremetalHost` via ironic-python-agent ramdisk during provisioning. The config is embedded in the ISO attached as virtual media via the BMC, so no DHCP is required.
41+
* `baremetalHostsNetworkData`: Final nmstate network configuration for EDPM nodes.
4142

4243
* `edpm_kernel_args`: Appends necessary kernel arguments for VFIO passthrough.
4344
* `intel_iommu=on iommu=pt`: Enables the IOMMU for device passthrough.

‎examples/va/nvidia-vfio-passthrough/edpm/nodeset/values.yaml‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,9 @@ data:
2020
bootMACAddress: CHANGEME
2121
rootDeviceHints:
2222
deviceName: /dev/vda
23-
preprovisioningNetworkData: |
24-
networkData:
25-
links:
26-
- id: provisioning
27-
type: phy
28-
name: CHANGEME
29-
networks:
30-
- id: provisioning
31-
type: ipv4
32-
link: provisioning
33-
ip_address: 172.22.0.100 # CHANGEME
34-
netmask: 255.255.255.0
35-
routes:
36-
- destination: 0.0.0.0/0
37-
next_hop: 172.22.0.1 # CHANGEME
23+
preprovisioningNetworkData:
24+
nmstate: |
25+
CHANGEME
3826
edpm-compute-1:
3927
labels:
4028
nodeName: edpm-compute-1
@@ -43,21 +31,16 @@ data:
4331
bootMACAddress: CHANGEME
4432
rootDeviceHints:
4533
deviceName: /dev/vda
46-
preprovisioningNetworkData: |
47-
networkData:
48-
links:
49-
- id: provisioning
50-
type: phy
51-
name: CHANGEME
52-
networks:
53-
- id: provisioning
54-
type: ipv4
55-
link: provisioning
56-
ip_address: 172.22.0.101 # CHANGEME
57-
netmask: 255.255.255.0
58-
routes:
59-
- destination: 0.0.0.0/0
60-
next_hop: 172.22.0.1 # CHANGEME
34+
preprovisioningNetworkData:
35+
nmstate: |
36+
CHANGEME
37+
baremetalHostsNetworkData:
38+
edpm-compute-0:
39+
networkData: |
40+
CHANGEME
41+
edpm-compute-1:
42+
networkData: |
43+
CHANGEME
6144
baremetalSetTemplate:
6245
ctlplaneInterface: eno2 # CHANGEME
6346
cloudUserName: cloud-admin
@@ -161,8 +144,14 @@ data:
161144
nodes:
162145
edpm-compute-0:
163146
hostName: edpm-compute-0
147+
networkData:
148+
name: edpm-compute-0-network-data
149+
namespace: openstack
164150
edpm-compute-1:
165151
hostName: edpm-compute-1
152+
networkData:
153+
name: edpm-compute-1-network-data
154+
namespace: openstack
166155
services:
167156
- bootstrap
168157
- download-cache

‎va/nvidia-vfio-passthrough/edpm/nodeset/kustomization.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ resources:
2424
- baremetalset-password-secret.yaml
2525
- nova_gpu.yaml
2626
- baremetalhost.yaml
27+
- network-data-secrets.yaml
2728

2829
patches:
2930
- target:
@@ -242,3 +243,28 @@ replacements:
242243
- stringData
243244
options:
244245
create: true
246+
# networkData
247+
- source:
248+
kind: ConfigMap
249+
name: edpm-nodeset-values
250+
fieldPath: data.baremetalHostsNetworkData.edpm-compute-0
251+
targets:
252+
- select:
253+
kind: Secret
254+
name: edpm-compute-0-network-data
255+
fieldPaths:
256+
- stringData
257+
options:
258+
create: true
259+
- source:
260+
kind: ConfigMap
261+
name: edpm-nodeset-values
262+
fieldPath: data.baremetalHostsNetworkData.edpm-compute-1
263+
targets:
264+
- select:
265+
kind: Secret
266+
name: edpm-compute-1-network-data
267+
fieldPaths:
268+
- stringData
269+
options:
270+
create: true

‎va/nvidia-vfio-passthrough/edpm/nodeset/network-data-secrets.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: edpm-compute-0-network-data
6+
namespace: openstack
7+
type: Opaque
8+
stringData: {}
9+
---
10+
apiVersion: v1
11+
kind: Secret
12+
metadata:
13+
name: edpm-compute-1-network-data
14+
namespace: openstack
15+
type: Opaque
16+
stringData: {}

0 commit comments

Comments
 (0)