Add baremetalHostsNetworkData for nova04delta

Based on bmo01 DT, add baremetalHostsNetworkData into kustomizations
and example values. Also separate edpm node 0 and edpm node 1 by
distinct nodesets 1 and 2.

Add a note about missing kustomizations replacements to wire-in
other data that can be provided for nodesets values.

Signed-off-by: Bohdan Dobrelia <[email protected]>

Author: bogdando

dt/nova/nova04delta/edpm/nodeset/kustomization.yaml

@@ -22,9 +22,24 @@ components:
 
 resources:
   - baremetalset-password-secret.yaml
+  - network-data-secrets.yaml
   - nova_gpu.yaml
 
+# TODO: wire-in all missing nodeset data values, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
 replacements:
+  # networkData
+  - source:
+      kind: ConfigMap
+      name: edpm-nodeset-values
+      fieldPath: data.baremetalHostsNetworkData.edpm-compute-0
+    targets:
+      - select:
+          kind: Secret
+          name: edpm-compute-0-network-data
+        fieldPaths:
+          - stringData
+        options:
+          create: true
   - source:
       kind: ConfigMap
       name: edpm-nodeset-values

dt/nova/nova04delta/edpm/nodeset/network-data-secrets.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: edpm-compute-0-network-data
+  namespace: openstack
+type: Opaque
+stringData: {}

dt/nova/nova04delta/edpm/nodeset2/kustomization.yaml

@@ -22,9 +22,24 @@ components:
 
 resources:
   - baremetalset-password-secret.yaml
+  - network-data-secrets.yaml
   - nova_gpu.yaml
 
+# TODO: wire-in all missing nodeset data values, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
 replacements:
+  # networkData
+  - source:
+      kind: ConfigMap
+      name: edpm-nodeset-values
+      fieldPath: data.baremetalHostsNetworkData.edpm-compute-1
+    targets:
+      - select:
+          kind: Secret
+          name: edpm-compute-1-network-data
+        fieldPaths:
+          - stringData
+        options:
+          create: true
   - source:
       kind: ConfigMap
       name: edpm-nodeset-values

dt/nova/nova04delta/edpm/nodeset2/network-data-secrets.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: edpm-compute-1-network-data
+  namespace: openstack
+type: Opaque
+stringData: {}

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

@@ -10,6 +10,10 @@ metadata:
 data:
   root_password: cmVkaGF0Cg==
   preProvisioned: false
+  baremetalHostsNetworkData:
+    edpm-compute-0:
+      networkData: |
+        CHANGEME
   baremetalSetTemplate:
     ctlplaneInterface: eno2  # CHANGEME
     cloudUserName: cloud-admin
@@ -26,6 +30,7 @@ data:
     private: CHANGEME2
     # The public key that will have access to the dataplane computes via SSH
     public: CHANGEME3
+  # TODO: wire-in all these with kustomize replaceemtns, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
   nodeset:
     ansible:
       ansibleUser: cloud-admin
@@ -49,13 +54,10 @@ data:
         # Nics to MAC addresses mappings for the dataplane nodes
         edpm_network_config_os_net_config_mappings:
           edpm-compute-0:
-            nic2: CHANGEME
-            nic3: CHANGEME
-          edpm-compute-1:
-            nic2: CHANGEME
-            nic3: CHANGEME
+            nic1: CHANGEME
         edpm_network_config_template: |
           ---
+          # CHANGEME
           {% set mtu_list = [ctlplane_mtu] %}
           {% for network in nodeset_networks %}
           {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
@@ -100,6 +102,7 @@ data:
         edpm_sshd_configure_firewall: true
         edpm_sshd_allowed_ranges:
           - 192.168.122.0/24
+    # FIXME: should I move this under nodes.edpm-compute-0?
     networks:
       - defaultRoute: true
         name: ctlplane
@@ -113,8 +116,13 @@ data:
     nodes:
       edpm-compute-0:
         hostName: edpm-compute-0
-      edpm-compute-1:
-        hostName: edpm-compute-1
+        bmhLabelSelector:
+          nodeName: edpm-compute-0
+        networkData:
+          name: edpm-compute-0-network-data
+          namespace: openstack
+        ansible:
+          ansibleHost: 192.168.122.100 # CHANGEME
     services:
       - bootstrap
       - download-cache

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

@@ -10,6 +10,10 @@ metadata:
 data:
   root_password: cmVkaGF0Cg==
   preProvisioned: false
+  baremetalHostsNetworkData:
+    edpm-compute-1:
+      networkData: |
+        CHANGEME
   baremetalSetTemplate:
     ctlplaneInterface: eno2  # CHANGEME
     cloudUserName: cloud-admin
@@ -26,6 +30,7 @@ data:
     private: CHANGEME2
     # The public key that will have access to the dataplane computes via SSH
     public: CHANGEME3
+  # TODO: wire-in all these with kustomize replaceemtns, like examples/dt/bmo01/dataplane/nodesets/kustomization.yaml
   nodeset:
     ansible:
       ansibleUser: cloud-admin
@@ -48,14 +53,11 @@ data:
         edpm_network_config_hide_sensitive_logs: false
         # Nics to MAC addresses mappings for the dataplane nodes
         edpm_network_config_os_net_config_mappings:
-          edpm-compute-0:
-            nic2: CHANGEME
-            nic3: CHANGEME
           edpm-compute-1:
-            nic2: CHANGEME
-            nic3: CHANGEME
+            nic1: CHANGEME
         edpm_network_config_template: |
           ---
+          # CHANGEME
           {% set mtu_list = [ctlplane_mtu] %}
           {% for network in nodeset_networks %}
           {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
@@ -100,6 +102,7 @@ data:
         edpm_sshd_configure_firewall: true
         edpm_sshd_allowed_ranges:
           - 192.168.122.0/24
+    # FIXME: should I move this under nodes.edpm-compute-1?
     networks:
       - defaultRoute: true
         name: ctlplane
@@ -111,10 +114,15 @@ data:
       - name: tenant
         subnetName: subnet1
     nodes:
-      edpm-compute-0:
-        hostName: edpm-compute-0
       edpm-compute-1:
         hostName: edpm-compute-1
+        bmhLabelSelector:
+          nodeName: edpm-compute-1
+        networkData:
+          name: edpm-compute-1-network-data
+          namespace: openstack
+        ansible:
+          ansibleHost: 192.168.122.101 # CHANGEME
     services:
       - bootstrap
       - download-cache