From bd6b40eae6213d8a24430733a97c3c82174a8d4f Mon Sep 17 00:00:00 2001
From: Fabricio Aguiar <fabricio.aguiar@gmail.com>
Date: Thu, 5 Oct 2023 11:15:53 +0100
Subject: [PATCH] Adding  back the dataplane services

Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>
---
 docs/openstack/edpm_adoption.md                |  2 +-
 tests/roles/dataplane_adoption/tasks/main.yaml | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/openstack/edpm_adoption.md b/docs/openstack/edpm_adoption.md
index b5a16cb78..0e9ea4d70 100644
--- a/docs/openstack/edpm_adoption.md
+++ b/docs/openstack/edpm_adoption.md
@@ -154,9 +154,9 @@ done
         - ctlplane
     preProvisioned: true
     services:
+      - download-cache
       - configure-network
       - validate-network
-      - download-cache
       - install-os
       - configure-os
       - run-os
diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml
index ea322280a..627f21e70 100644
--- a/tests/roles/dataplane_adoption/tasks/main.yaml
+++ b/tests/roles/dataplane_adoption/tasks/main.yaml
@@ -1,3 +1,11 @@
+- name: force latest ansible-runner image
+  no_log: "{{ use_no_log }}"
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    {{ oc_login_command }}
+    oc get csv openstack-ansibleee-operator.v0.0.1 -o yaml -n openstack-operators | sed "s/RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT/AEE_IMAGE/" | oc apply -f -
+
 - name: ensure oc login
   no_log: "{{ use_no_log }}"
   ansible.builtin.shell: |
@@ -166,9 +174,13 @@
         - ctlplane
       preProvisioned: true
       services:
+        - download-cache
         - configure-network
         - validate-network
         - install-os
+        - configure-os
+        - run-os
+        - ovn
       env:
         - name: ANSIBLE_CALLBACKS_ENABLED
           value: "profile_tasks"
@@ -300,6 +312,6 @@
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}
-    oc wait --for condition=Ready osdpns/openstack --timeout=30m
+    oc wait --for condition=Ready osdpns/openstack --timeout=40m
   # TODO: work on network configuration for making possible to run this task on other IP ranges
   when: "edpm_node_ip.startswith('192.168.122')"