From c26f63de50f10284914650802335bd7c50637f64 Mon Sep 17 00:00:00 2001
From: zuul <zuul@sf.hosted.upshift.rdu2.redhat.com>
Date: Wed, 21 Aug 2024 08:37:37 -0400
Subject: [PATCH] hci fixes

---
 automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml  | 20 +++++++++++++++++++
 automation/vars/nfv-ovs-dpdk-sriov-hci.yaml   | 11 ++++++----
 .../deployment/kustomization.yaml             | 11 ++++++++++
 .../edpm-pre-ceph/deployment/values.yaml      |  1 -
 zuul.d/validations.yaml                       |  1 +
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml

diff --git a/automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml b/automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml
new file mode 100644
index 000000000..6af07e47d
--- /dev/null
+++ b/automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml
@@ -0,0 +1,20 @@
+---
+cifmw_baremetal_hosts:
+  compute-0:
+    connection: ipmi://10.10.100.100
+    boot_mode: UEFI
+    nics:
+      - mac: "89:9a:b7:cb:4a:3f"
+        network: provision
+    credentials_file: "/home/user/foo.yaml"
+    root_device_hint_field: "wwnWithExtension"
+    root_device_hint: "0x6509a4c0ac82ff002dbccf463196ca41"
+  compute-1:
+    connection: ipmi://10.10.100.101
+    boot_mode: UEFI
+    nics:
+      - mac: "53:b0:4d:06:56:ea"
+        network: provision
+    credentials_file: "/home/user/foo.yaml"
+    root_device_hint_field: "wwnWithExtension"
+    root_device_hint: "0x55cd2e414e372c06"
diff --git a/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml b/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml
index 30bdcb021..fd324f48b 100644
--- a/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml
+++ b/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml
@@ -50,8 +50,10 @@ vas:
         post_stage_run:
           - name: Deploy Ceph
             type: playbook
-            source: "../../playbooks/ceph.yml"
+            source: "../../hooks/playbooks/ceph-bm.yml"
             inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"
+            extra_vars:
+              cifmw_cephadm_log_path: /home/zuul/ci-framework-data/logs/ceph
 
       - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci
         wait_conditions:
@@ -69,9 +71,10 @@ vas:
       - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment
         wait_conditions:
           - >-
-            oc -n openstack wait
-            osdpns openstack-edpm --for condition=Ready
-            --timeout=60m
+            oc -n openstack
+            wait openstackdataplanedeployments.dataplane.openstack.org
+            edpm-deployment-post-ceph
+            --for condition=Ready --timeout=60m
         values:
           - name: edpm-deployment-values-post-ceph
             src_file: values.yaml
diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment/kustomization.yaml
index 28bd9dbe3..3ac78e390 100644
--- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment/kustomization.yaml
+++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment/kustomization.yaml
@@ -24,3 +24,14 @@ replacements:
           - spec.servicesOverride
         options:
           create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-deployment-values-post-ceph
+      fieldPath: data.deployment.name
+    targets:
+      - select:
+          kind: OpenStackDataPlaneDeployment
+        fieldPaths:
+          - metadata.name
+        options:
+          create: true
diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment/values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment/values.yaml
index f5d072544..cb4c72341 100644
--- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment/values.yaml
+++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment/values.yaml
@@ -22,4 +22,3 @@ data:
     - configure-os
     - ssh-known-hosts
     - run-os
-    - reboot-os
diff --git a/zuul.d/validations.yaml b/zuul.d/validations.yaml
index 20695b40e..0d0073cb0 100644
--- a/zuul.d/validations.yaml
+++ b/zuul.d/validations.yaml
@@ -41,6 +41,7 @@
       cifmw_architecture_scenario: hci
 - job:
     files:
+    - automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml
     - examples/dt/nfv/nfv-ovs-dpdk-sriov-hci
     - examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane
     - examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp