From 2d6dc6a53c17312d35443b494a4680d58693173d Mon Sep 17 00:00:00 2001
From: Bohdan Dobrelia <bdobreli@redhat.com>
Date: Mon, 13 Nov 2023 15:19:15 +0100
Subject: [PATCH] Fix nova ffu svc

Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
---
 docs/openstack/edpm_adoption.md               | 47 ++-----------------
 .../dataplane_adoption/tasks/nova_ffu.yaml    | 47 ++-----------------
 2 files changed, 8 insertions(+), 86 deletions(-)

diff --git a/docs/openstack/edpm_adoption.md b/docs/openstack/edpm_adoption.md
index 89a7cfac0..396a2470e 100644
--- a/docs/openstack/edpm_adoption.md
+++ b/docs/openstack/edpm_adoption.md
@@ -334,46 +334,6 @@ later on.
 > **NOTE**: Additional orchestration happening around the FFU workarounds
 > configuration for Nova compute EDPM service is a subject of future changes.
 
-* Configure pre-FFU workarounds for Nova compute EDPM services to update its version records:
-
-    ```yaml
-    oc apply -f - <<EOF
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: nova-compute-workarounds
-      namespace: openstack
-    data:
-      19-nova-compute-cell1-workarounds.conf: |
-        [workarounds]
-        disable_compute_service_check_for_ffu=true
-    EOF
-
-    oc apply -f - <<EOF
-    apiVersion: dataplane.openstack.org/v1beta1
-    kind: OpenStackDataPlaneService
-    metadata:
-      name: nova-compute-workarounds
-      namespace: openstack
-    spec:
-      label: nova.compute.workarounds
-      configMaps:
-        - nova-compute-workarounds
-      playbook: osp.edpm.nova
-    ---
-    apiVersion: dataplane.openstack.org/v1beta1
-    kind: OpenStackDataPlaneDeployment
-    metadata:
-      name: openstack-nova-compute-workarounds
-      namespace: openstack
-    spec:
-      nodeSets:
-        - openstack
-      servicesOverride:
-        - nova-compute-workarounds
-    EOF
-    ```
-
 * Wait for cell1 Nova compute EDPM services version updated (it may take some time):
 
     ```bash
@@ -455,9 +415,7 @@ later on.
       20-nova-compute-cell1-ffu-cleanup.conf: |
         [workarounds]
         disable_compute_service_check_for_ffu=false
-    EOF
-
-    oc apply -f - <<EOF
+    ---
     apiVersion: dataplane.openstack.org/v1beta1
     kind: OpenStackDataPlaneService
     metadata:
@@ -467,6 +425,9 @@ later on.
       label: nova.compute.ffu
       configMaps:
         - nova-compute-ffu
+      configSecrets:
+        - nova-cell1-compute-config
+        - nova-migration-ssh-key
       playbook: osp.edpm.nova
     ---
     apiVersion: dataplane.openstack.org/v1beta1
diff --git a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
index bb201fd1e..c7198292d 100644
--- a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
+++ b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
@@ -3,46 +3,6 @@
     name: mariadb_copy
     tasks_from: env_vars_dst.yaml
 
-- name: configure pre-FFU workarounds for Nova compute EDPM services to update its version records
-  ansible.builtin.shell: |
-    {{ shell_header }}
-    {{ oc_header }}
-    oc apply -f - <<EOF
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: nova-compute-workarounds
-      namespace: openstack
-    data:
-      19-nova-compute-cell1-workarounds.conf: |
-        [workarounds]
-        disable_compute_service_check_for_ffu=true
-    EOF
-
-    oc apply -f - <<EOF
-    apiVersion: dataplane.openstack.org/v1beta1
-    kind: OpenStackDataPlaneService
-    metadata:
-      name: nova-compute-workarounds
-      namespace: openstack
-    spec:
-      label: nova.compute.workarounds
-      configMaps:
-        - nova-compute-workarounds
-      playbook: osp.edpm.nova
-    ---
-    apiVersion: dataplane.openstack.org/v1beta1
-    kind: OpenStackDataPlaneDeployment
-    metadata:
-      name: openstack-nova-compute-workarounds
-      namespace: openstack
-    spec:
-      nodeSets:
-        - openstack
-      servicesOverride:
-        - nova-compute-workarounds
-    EOF
-
 - name: wait for cell1 Nova compute EDPM services version updated
   ansible.builtin.shell: |
     {{ shell_header }}
@@ -111,9 +71,7 @@
       20-nova-compute-cell1-ffu-cleanup.conf: |
         [workarounds]
         disable_compute_service_check_for_ffu=false
-    EOF
-
-    oc apply -f - <<EOF
+    ---
     apiVersion: dataplane.openstack.org/v1beta1
     kind: OpenStackDataPlaneService
     metadata:
@@ -123,6 +81,9 @@
       label: nova.compute.ffu
       configMaps:
         - nova-compute-ffu
+      configSecrets:
+        - nova-cell1-compute-config
+        - nova-migration-ssh-key
       playbook: osp.edpm.nova
     ---
     apiVersion: dataplane.openstack.org/v1beta1