[DNM] Testing NVMe OTU feature

Author: jamepark4

automation/vars/nova02beta.yaml

@@ -37,17 +37,6 @@ vas:
             src_file: values.yaml
         build_output: nodeset.yaml
 
-      - path: examples/dt/nova/nova02beta/edpm/nodeset2
-        wait_conditions:
-          - >-
-            oc -n openstack wait
-            osdpns openstack-edpm-2 --for condition=SetupReady
-            --timeout=60m
-        values:
-          - name: edpm-nodeset-values
-            src_file: values.yaml
-        build_output: nodeset2.yaml
-
       - path: examples/dt/nova/nova02beta/edpm/deployment
         wait_conditions:
           - >-

dt/nova/nova02beta/edpm/nodeset2/baremetalset-password-secret.yaml

@@ -92,6 +92,28 @@ replacements:
           - spec.nova.template.apiServiceTemplate.customServiceConfig
         options:
           create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.nova.cell0.conductorServiceTemplate.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.nova.template.cellTemplates.cell0.conductorServiceTemplate.customServiceConfig
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.nova.cell1.conductorServiceTemplate.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.nova.template.cellTemplates.cell1.conductorServiceTemplate.customServiceConfig
+        options:
+          create: true
   - source:
       kind: ConfigMap
       name: service-values

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

@@ -10,12 +10,3 @@ components:
 
 resources:
   - values.yaml
-
-patches:
-  - target:
-      kind: OpenStackDataPlaneDeployment
-      name: edpm-deployment
-    patch: |
-      - op: add
-        path: /spec/nodeSets/-
-        value: openstack-edpm-2