Merge pull request #434 from hjensas/bmo01-bmhLabelSelector

Use bmhLabelSelector in DT bmo01 Select a particular BMH for a node using bmhLabelSelector, validate 1-to-1 mapping. jira: OSPRH-10282 Reviewed-by: Rabi Mishra <ramishra@redhat.com> Reviewed-by: John Fulton <johfulto@redhat.com>
openstack-k8s-operators · Nov 5, 2024 · b2662a0 · b2662a0
2 parents 84c84d0 + db92ee5
commit b2662a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/examples/dt/bmo01/dataplane/baremetalhosts/values.yaml b/examples/dt/bmo01/dataplane/baremetalhosts/values.yaml
@@ -14,6 +14,7 @@ data:
     labels:
       app: openstack
       nodeset: leaf0
+      nodeName: leaf0-0
     bmc:
       address: redfish-virtualmedia+http://sushy.utility:8000/redfish/v1/Systems/df2bf92f-3e2c-47e1-b1fa-0d2e06bd1b1d
     bootMACAddress: 52:54:04:15:a8:d9
@@ -44,6 +45,7 @@ data:
     labels:
       app: openstack
       nodeset: leaf0
+      nodeName: leaf0-1
     bmc:
       address: redfish-virtualmedia+http://sushy.utility:8000/redfish/v1/Systems/455a0036-11f9-4417-a150-9ee858cd7b3d
     bootMACAddress: 52:54:05:59:03:e9
@@ -74,6 +76,7 @@ data:
     labels:
       app: openstack
       nodeset: leaf1
+      nodeName: leaf1-0
     bmc:
       address: redfish-virtualmedia+http://sushy.utility:8000/redfish/v1/Systems/adbcfb62-afe9-488d-8e67-c3fd711e46e8
     bootMACAddress: 52:54:06:49:2a:d2
@@ -104,6 +107,7 @@ data:
     labels:
       app: openstack
       nodeset: leaf1
+      nodeName: leaf1-1
     bmc:
       address: redfish-virtualmedia+http://sushy.utility:8000/redfish/v1/Systems/f5da12a3-b71d-4b81-9805-ebd5a2cd7bdf
     bootMACAddress: 52:54:07:5f:0c:f4

diff --git a/examples/dt/bmo01/dataplane/nodesets/values.yaml b/examples/dt/bmo01/dataplane/nodesets/values.yaml
@@ -102,6 +102,8 @@ data:
               address: 192.168.122.1
     nodes:
       edpm-compute-0-0:
+        bmhLabelSelector:
+          nodeName: leaf0-0
         networkData:
           name: edpm-compute-0-0-network-data
           namespace: openstack
@@ -120,6 +122,8 @@ data:
           - name: tenant
             subnetName: subnet2
       edpm-compute-0-1:
+        bmhLabelSelector:
+          nodeName: leaf0-1
         networkData:
           name: edpm-compute-0-1-network-data
           namespace: openstack
@@ -198,6 +202,8 @@ data:
               address: 192.168.122.1
     nodes:
       edpm-compute-1-0:
+        bmhLabelSelector:
+          nodeName: leaf1-0
         networkData:
           name: edpm-compute-1-0-network-data
           namespace: openstack
@@ -216,6 +222,8 @@ data:
           - name: tenant
             subnetName: subnet3
       edpm-compute-1-1:
+        bmhLabelSelector:
+          nodeName: leaf1-1
         networkData:
           name: edpm-compute-1-1-network-data
           namespace: openstack