From 50e8b7246479844ad45e09c954339ea4c1055ca7 Mon Sep 17 00:00:00 2001
From: Sean Mooney <work@seanmooney.info>
Date: Thu, 21 Mar 2024 19:28:13 +0000
Subject: [PATCH] do not create a seperate nova service for post ffu

the previous workflow created a new configmap and
dataplane service to deploy nova in a second deployment
post ffu. this was inherintly buggy as the node set still
refernced the orginal dataplane service and the old configmap.

That means if you did a deployment in the futrue it would revert
to the ffu config.

This change correct that by updating the workflow to modify the existing
configmap and redeploy the orginal service. This is more inline with
how adoption is intended to work as we dont intend multiple datapalne
services for the same openstack service to be used against the
same nodeset.
---
 .../modules/openstack-edpm_adoption.adoc      | 20 ++------
 .../dataplane_adoption/tasks/nova_ffu.yaml    | 50 +++++++++++--------
 2 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/docs_user/modules/openstack-edpm_adoption.adoc b/docs_user/modules/openstack-edpm_adoption.adoc
index 77541eaea..19b8a255f 100644
--- a/docs_user/modules/openstack-edpm_adoption.adoc
+++ b/docs_user/modules/openstack-edpm_adoption.adoc
@@ -584,28 +584,14 @@ oc apply -f - <<EOF
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nova-compute-ffu
+  name: nova-compute-extraconfig
   namespace: openstack
 data:
-  20-nova-compute-cell1-ffu-cleanup.conf: |
+  20-nova-compute-cell1-workarounds.conf: |
     [workarounds]
     disable_compute_service_check_for_ffu=false
 ---
 apiVersion: dataplane.openstack.org/v1beta1
-kind: OpenStackDataPlaneService
-metadata:
-  name: nova-compute-ffu
-  namespace: openstack
-spec:
-  label: nova.compute.ffu
-  configMaps:
-    - nova-compute-ffu
-  secrets:
-    - nova-cell1-compute-config
-    - nova-migration-ssh-key
-  playbook: osp.edpm.nova
----
-apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneDeployment
 metadata:
   name: openstack-nova-compute-ffu
@@ -614,7 +600,7 @@ spec:
   nodeSets:
     - openstack
   servicesOverride:
-    - nova-compute-ffu
+    - nova-compute-extraconfig
 EOF
 ----
 
diff --git a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
index d3cc5dd9e..49800de11 100644
--- a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
+++ b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
@@ -65,28 +65,14 @@
     apiVersion: v1
     kind: ConfigMap
     metadata:
-      name: nova-compute-ffu
+      name: nova-compute-extraconfig
       namespace: openstack
     data:
-      20-nova-compute-cell1-ffu-cleanup.conf: |
+      20-nova-compute-cell1-workarounds.conf: |
         [workarounds]
         disable_compute_service_check_for_ffu=false
     ---
     apiVersion: dataplane.openstack.org/v1beta1
-    kind: OpenStackDataPlaneService
-    metadata:
-      name: nova-compute-ffu
-      namespace: openstack
-    spec:
-      label: nova.compute.ffu
-      configMaps:
-        - nova-compute-ffu
-      secrets:
-        - nova-cell1-compute-config
-        - nova-migration-ssh-key
-      playbook: osp.edpm.nova
-    ---
-    apiVersion: dataplane.openstack.org/v1beta1
     kind: OpenStackDataPlaneDeployment
     metadata:
       name: openstack-nova-compute-ffu
@@ -95,18 +81,38 @@
       nodeSets:
         - openstack
       servicesOverride:
-        - nova-compute-ffu
+        - nova-compute-extraconfig
     EOF
 
 - name: wait for Nova compute EDPM services to become ready
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}
-    oc wait --for condition=Ready osdpd/openstack-nova-compute-ffu --timeout=5m
-  register: nova_ffu_edpm_result
-  until: nova_ffu_edpm_result is success
-  retries: 10
-  delay: 6
+
+    DEPLOYMENT_NAME=openstack-nova-compute-ffu
+    TRIES=180
+    DELAY=10
+    ALLOWED_JOB_RETRIES=3
+
+    for i in $(seq $TRIES)
+    do
+        ready=$(oc get osdpd/$DEPLOYMENT_NAME -o jsonpath='{.status.conditions[0].status}')
+        if [ "$ready" == "True" ]; then
+            echo "Deployment is Ready"
+            exit 0
+        else
+            failed=$(oc get jobs -l osdpd=$DEPLOYMENT_NAME -o jsonpath="{.items[?(@.status.failed > $ALLOWED_JOB_RETRIES)].metadata.name}")
+            if [ ! -z "${failed}" ]; then
+                echo "There are failed AnsibleEE jobs: $failed"
+                exit 1
+            fi
+        fi
+
+    sleep $DELAY
+    done
+
+    echo "Run out of retries"
+    exit 2
 
 - name: run Nova DB migrations to complete Wallaby->antelope FFU
   ansible.builtin.shell: |