Skip to content

Commit e5d1c0e

Browse files
committed
Explain kustomize mappings for nova04delta
Signed-off-by: Bohdan Dobrelia <[email protected]>
1 parent 8ebd055 commit e5d1c0e

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ metadata:
88
annotations:
99
config.kubernetes.io/local-config: "true"
1010
data:
11+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to baremetalset-password-secret.data.NodeRootPassword
1112
root_password: cmVkaGF0Cg==
13+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to OpenStackDataPlaneNodeSet.spec.preProvisioned
1214
preProvisioned: false
15+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to BareMetalHost.metadata.annotations.inspect.metal3.io
1316
metal3_inspection: disabled
17+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to BareMetalHost resource properties
1418
baremetalhosts:
1519
edpm-compute-0:
1620
labels:
@@ -23,10 +27,12 @@ data:
2327
preprovisioningNetworkData:
2428
nmstate: |
2529
CHANGEME
30+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to edpm-compute-0-network-data Secret
2631
baremetalHostsNetworkData:
2732
edpm-compute-0:
2833
networkData: |
2934
CHANGEME
35+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to OpenStackDataPlaneNodeSet.spec.baremetalSetTemplate
3036
baremetalSetTemplate:
3137
ctlplaneInterface: eno2 # CHANGEME
3238
cloudUserName: cloud-admin
@@ -36,14 +42,15 @@ data:
3642
passwordSecret:
3743
name: baremetalset-password-secret
3844
namespace: openstack
45+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to the dataplane-ansible-ssh-private-key-secret
3946
ssh_keys:
4047
# Authorized keys that will have access to the dataplane computes via SSH
4148
authorized: CHANGEME
4249
# The private key that will have access to the dataplane computes via SSH
4350
private: CHANGEME2
4451
# The public key that will have access to the dataplane computes via SSH
4552
public: CHANGEME3
46-
# TODO: wire-in all these with kustomize replaceemtns, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
53+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to OpenStackDataPlaneNodeSet spec properties
4754
nodeset:
4855
ansible:
4956
ansibleUser: cloud-admin
@@ -115,8 +122,7 @@ data:
115122
edpm_sshd_configure_firewall: true
116123
edpm_sshd_allowed_ranges:
117124
- 192.168.122.0/24
118-
# FIXME: should I move this under nodes.edpm-compute-0?
119-
networks:
125+
networks: # mapped to spec.nodeTemplate.networks
120126
- defaultRoute: true
121127
name: ctlplane
122128
subnetName: subnet1
@@ -126,7 +132,7 @@ data:
126132
subnetName: subnet1
127133
- name: tenant
128134
subnetName: subnet1
129-
nodes:
135+
nodes: # mapped to spec.nodes
130136
edpm-compute-0:
131137
hostName: edpm-compute-0
132138
bmhLabelSelector:
@@ -136,7 +142,7 @@ data:
136142
namespace: openstack
137143
ansible:
138144
ansibleHost: 192.168.122.100 # CHANGEME
139-
services:
145+
services: # mapped to spec.services
140146
- bootstrap
141147
- download-cache
142148
- configure-network
@@ -154,6 +160,7 @@ data:
154160
- neutron-metadata
155161
- vfio-pci-bind
156162
nova:
163+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to cpu-pinning-nova ConfigMap
157164
compute:
158165
conf: |
159166
# CHANGEME
@@ -164,10 +171,12 @@ data:
164171
[compute]
165172
cpu_shared_set = 0-3,24-27
166173
cpu_dedicated_set = 8-23,32-47
174+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to the nova-migration-ssh-key secret
167175
migration:
168176
ssh_keys:
169177
private: CHANGEME4
170178
public: CHANGEME5
179+
# Mapped in dt/nova/nova04delta/edpm/nodeset/kustomization.yaml to gpu-nova ConfigMap
171180
pci:
172181
# You will have one device_spec line for each physical GPU you want to make available for passthrough:
173182
# "vendor_id": The vendor ID of the GPU manufacturer (e.g., "10de" for NVIDIA).

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ metadata:
88
annotations:
99
config.kubernetes.io/local-config: "true"
1010
data:
11+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to baremetalset-password-secret.data.NodeRootPassword
1112
root_password: cmVkaGF0Cg==
13+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to OpenStackDataPlaneNodeSet.spec.preProvisioned
1214
preProvisioned: false
15+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to BareMetalHost.metadata.annotations.inspect.metal3.io
1316
metal3_inspection: disabled
17+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to BareMetalHost resource properties
1418
baremetalhosts:
1519
edpm-compute-1:
1620
labels:
@@ -23,10 +27,12 @@ data:
2327
preprovisioningNetworkData:
2428
nmstate: |
2529
CHANGEME
30+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to edpm-compute-1-network-data Secret
2631
baremetalHostsNetworkData:
2732
edpm-compute-1:
2833
networkData: |
2934
CHANGEME
35+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to OpenStackDataPlaneNodeSet.spec.baremetalSetTemplate
3036
baremetalSetTemplate:
3137
ctlplaneInterface: eno2 # CHANGEME
3238
cloudUserName: cloud-admin
@@ -36,14 +42,15 @@ data:
3642
passwordSecret:
3743
name: baremetalset-password-secret
3844
namespace: openstack
45+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to the dataplane-ansible-ssh-private-key-secret
3946
ssh_keys:
4047
# Authorized keys that will have access to the dataplane computes via SSH
4148
authorized: CHANGEME
4249
# The private key that will have access to the dataplane computes via SSH
4350
private: CHANGEME2
4451
# The public key that will have access to the dataplane computes via SSH
4552
public: CHANGEME3
46-
# TODO: wire-in all these with kustomize replaceemtns, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
53+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to OpenStackDataPlaneNodeSet spec properties
4754
nodeset:
4855
ansible:
4956
ansibleUser: cloud-admin
@@ -115,7 +122,6 @@ data:
115122
edpm_sshd_configure_firewall: true
116123
edpm_sshd_allowed_ranges:
117124
- 192.168.122.0/24
118-
# FIXME: should I move this under nodes.edpm-compute-1?
119125
networks:
120126
- defaultRoute: true
121127
name: ctlplane
@@ -153,6 +159,7 @@ data:
153159
- nova-custom-gpu-2
154160
- neutron-metadata
155161
- vfio-pci-bind-2
162+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to cpu-pinning-nova-2 ConfigMap
156163
nova:
157164
compute:
158165
conf: |
@@ -164,10 +171,12 @@ data:
164171
[compute]
165172
cpu_shared_set = 0-3,24-27
166173
cpu_dedicated_set = 8-23,32-47
174+
# Mapped in lib/dataplane/nodeset/kustomization.yaml to the nova-migration-ssh-key secret
167175
migration:
168176
ssh_keys:
169177
private: CHANGEME4
170178
public: CHANGEME5
179+
# Mapped in dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml to gpu-nova-2 ConfigMap
171180
pci:
172181
# You will have one device_spec line for each physical GPU you want to make available for passthrough:
173182
# "vendor_id": The vendor ID of the GPU manufacturer (e.g., "10de" for NVIDIA).

0 commit comments

Comments
 (0)