From e2ab98741058bdc5abfcae46ffd08973636a5084 Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Mon, 19 Aug 2024 09:02:31 +0200
Subject: [PATCH] [BGP] Use 'nova' service instead of 'nova-custom'

(cherry picked from d673612b0b055073674b17688318c4f3194af9a0)
---
 dt/bgp/edpm/nodeset/kustomization.yaml        |  3 ---
 dt/bgp/edpm/nodeset/nova_custom.yaml          | 21 -------------------
 .../dt/bgp/bgp_dt01/edpm/computes/values.yaml |  2 +-
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 dt/bgp/edpm/nodeset/nova_custom.yaml

diff --git a/dt/bgp/edpm/nodeset/kustomization.yaml b/dt/bgp/edpm/nodeset/kustomization.yaml
index 94559bce3..8ebefd5be 100644
--- a/dt/bgp/edpm/nodeset/kustomization.yaml
+++ b/dt/bgp/edpm/nodeset/kustomization.yaml
@@ -19,6 +19,3 @@ transformers:
 
 components:
   - ../../../../lib/dataplane/nodeset
-
-resources:
-  - nova_custom.yaml
diff --git a/dt/bgp/edpm/nodeset/nova_custom.yaml b/dt/bgp/edpm/nodeset/nova_custom.yaml
deleted file mode 100644
index 58ec600d1..000000000
--- a/dt/bgp/edpm/nodeset/nova_custom.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-apiVersion: dataplane.openstack.org/v1beta1
-kind: OpenStackDataPlaneService
-metadata:
-  name: nova-custom
-spec:
-  dataSources:
-    - secretRef:
-        name: nova-cell1-compute-config
-    - secretRef:
-        name: nova-migration-ssh-key
-  playbook: osp.edpm.nova
-  tlsCerts:
-    default:
-      contents:
-        - dnsnames
-        - ips
-      networks:
-        - ctlplane
-      issuer: osp-rootca-issuer-internal
-  caCerts: combined-ca-bundle
diff --git a/examples/dt/bgp/bgp_dt01/edpm/computes/values.yaml b/examples/dt/bgp/bgp_dt01/edpm/computes/values.yaml
index a0862509c..87517ffb9 100644
--- a/examples/dt/bgp/bgp_dt01/edpm/computes/values.yaml
+++ b/examples/dt/bgp/bgp_dt01/edpm/computes/values.yaml
@@ -253,7 +253,7 @@ data:
       - neutron-metadata
       - ovn-bgp-agent
       - libvirt
-      - nova-custom
+      - nova
   nova:
     migration:
       ssh_keys: