Merge pull request #296 from abays/new_edpm_datasources

Use new EDPM 'dataSources' for custom OpenStackDataPlaneServices Required changes due to openstack-k8s-operators/openstack-operator#852 Reviewed-by: John Fulton <[email protected]>
openstack-k8s-operators · Jun 18, 2024 · 4414684 · 4414684
2 parents 5845d9c + 33a184d
commit 4414684
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 34 deletions.
diff --git a/dt/bgp/edpm/nodeset/nova_custom.yaml b/dt/bgp/edpm/nodeset/nova_custom.yaml
@@ -4,9 +4,11 @@ kind: OpenStackDataPlaneService
 metadata:
   name: nova-custom
 spec:
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   tlsCerts:
     default:

diff --git a/dt/uni04delta/edpm/nodeset/nova_ceph.yaml b/dt/uni04delta/edpm/nodeset/nova_ceph.yaml
@@ -13,11 +13,13 @@ metadata:
   name: nova-custom-ceph
 spec:
   label: dataplane-deployment-nova-custom-ceph
-  configMaps:
-    - ceph-nova
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - configMapRef:
+        name: ceph-nova
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   caCerts: combined-ca-bundle
   edpmServiceType: nova

diff --git a/dt/uni05epsilon/edpm/nodeset/nova_custom.yaml b/dt/uni05epsilon/edpm/nodeset/nova_custom.yaml
@@ -18,11 +18,13 @@ metadata:
   name: nova-custom
 spec:
   label: dataplane-deployment-nova-custom
-  configMaps:
-    - nova-custom-config
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - configMapRef:
+        name: nova-custom-config
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   caCerts: combined-ca-bundle
   edpmServiceType: nova

diff --git a/va/hci/edpm-post-ceph/nodeset/nova_ceph.yaml b/va/hci/edpm-post-ceph/nodeset/nova_ceph.yaml
@@ -12,11 +12,13 @@ metadata:
   name: nova-custom-ceph
 spec:
   label: dataplane-deployment-nova-custom-ceph
-  configMaps:
-    - ceph-nova
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - configMapRef:
+        name: ceph-nova
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   tlsCerts:
     default:

diff --git a/va/nfv/ovs-dpdk-sriov/edpm/nodeset/neutron_igmp.yaml b/va/nfv/ovs-dpdk-sriov/edpm/nodeset/neutron_igmp.yaml
@@ -13,12 +13,13 @@ metadata:
 spec:
   label: neutron-ovn-igmp
   edpmServiceType: neutron-ovn
-  configMaps:
-    - neutron-igmp
   caCerts: combined-ca-bundle
   playbook: osp.edpm.neutron_ovn
-  secrets:
-    - neutron-ovn-agent-neutron-config
+  dataSources:
+    - configMapRef:
+        name: neutron-igmp
+    - secretRef:
+        name: neutron-ovn-agent-neutron-config
   tlsCerts:
     default:
       contents:

diff --git a/va/nfv/ovs-dpdk-sriov/edpm/nodeset/nova_ovs_dpdk_sriov.yaml b/va/nfv/ovs-dpdk-sriov/edpm/nodeset/nova_ovs_dpdk_sriov.yaml
@@ -20,12 +20,15 @@ metadata:
 spec:
   label: nova-custom-ovsdpdksriov
   edpmServiceType: nova
-  configMaps:
-    - ovs-dpdk-sriov-cpu-pinning-nova
-    - sriov-nova
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - configMapRef:
+        name: ovs-dpdk-sriov-cpu-pinning-nova
+    - configMapRef:
+        name: sriov-nova
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   tlsCerts:
     default:

diff --git a/va/nfv/sriov/edpm/nodeset/nova_sriov.yaml b/va/nfv/sriov/edpm/nodeset/nova_sriov.yaml
@@ -20,12 +20,15 @@ metadata:
 spec:
   label: dataplane-deployment-nova-custom-sriov
   edpmServiceType: nova
-  configMaps:
-    - cpu-pinning-nova
-    - sriov-nova
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
+  dataSources:
+    - configMapRef:
+        name: cpu-pinning-nova
+    - configMapRef:
+        name: sriov-nova
+    - secretRef:
+        name: nova-cell1-compute-config
+    - secretRef:
+        name: nova-migration-ssh-key
   playbook: osp.edpm.nova
   tlsCerts:
     default: