hci fixes

openstack-k8s-operators · Aug 29, 2024 · e0a4508 · e0a4508
1 parent 449b690
commit e0a4508
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 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/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