hci fixes

openstack-k8s-operators · Sep 2, 2024 · c982054 · c982054
1 parent 8cb4e08
commit c982054
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/automation/vars/default.yaml b/automation/vars/default.yaml
@@ -271,8 +271,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:

diff --git a/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml b/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml
@@ -50,8 +50,11 @@ 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
+              _namespace: "{{ _namespace}}"
 
       - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci
         wait_conditions:
@@ -69,9 +72,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
@@ -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
@@ -22,4 +22,3 @@ data:
     - configure-os
     - ssh-known-hosts
     - run-os
-    - reboot-os