From d1a781ade28311a3f3cbe2ed30d8620151df3a2f Mon Sep 17 00:00:00 2001
From: Grzegorz Grasza <xek@redhat.com>
Date: Tue, 2 Apr 2024 15:49:18 +0200
Subject: [PATCH] Disable TLS-E

Set TLS-E to disabled, since it's being enabled by default
for greenfield deployments. Settings should not be changed
during adoption, and the currently tested scenario doesn't
support TLS-E.

This also adds a barbican section that's present in the docs
but missing in the tests.
---
 .../openstack-backend_services_deployment.adoc        |  4 ++++
 docs_user/modules/openstack-dataplane_adoption.adoc   |  1 +
 tests/config/base/openstack_control_plane.yaml        | 11 +++++++++++
 tests/roles/dataplane_adoption/tasks/main.yaml        |  1 +
 4 files changed, 17 insertions(+)

diff --git a/docs_user/modules/openstack-backend_services_deployment.adoc b/docs_user/modules/openstack-backend_services_deployment.adoc
index 75b96c315..5153407e6 100644
--- a/docs_user/modules/openstack-backend_services_deployment.adoc
+++ b/docs_user/modules/openstack-backend_services_deployment.adoc
@@ -148,6 +148,10 @@ spec:
   secret: osp-secret
   storageClass: local-storage
 
+  tls:
+    podLevel:
+      enabled: false
+
   barbican:
     enabled: false
     template:
diff --git a/docs_user/modules/openstack-dataplane_adoption.adoc b/docs_user/modules/openstack-dataplane_adoption.adoc
index 969cc41e3..500702cef 100644
--- a/docs_user/modules/openstack-dataplane_adoption.adoc
+++ b/docs_user/modules/openstack-dataplane_adoption.adoc
@@ -260,6 +260,7 @@ kind: OpenStackDataPlaneNodeSet
 metadata:
   name: openstack
 spec:
+  tlsEnabled: false
   networkAttachments:
       - ctlplane
   preProvisioned: true
diff --git a/tests/config/base/openstack_control_plane.yaml b/tests/config/base/openstack_control_plane.yaml
index 9e361cf4c..de3c1606f 100644
--- a/tests/config/base/openstack_control_plane.yaml
+++ b/tests/config/base/openstack_control_plane.yaml
@@ -6,6 +6,17 @@ spec:
   secret: osp-secret
   storageClass: local-storage
 
+  tls:
+    podLevel:
+      enabled: false
+
+  barbican:
+    enabled: false
+    template:
+      barbicanAPI: {}
+      barbicanWorker: {}
+      barbicanKeystoneListener: {}
+
   cinder:
     enabled: false
     template:
diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml
index 235778da5..f97847515 100644
--- a/tests/roles/dataplane_adoption/tasks/main.yaml
+++ b/tests/roles/dataplane_adoption/tasks/main.yaml
@@ -149,6 +149,7 @@
     metadata:
       name: openstack
     spec:
+      tlsEnabled: false
       networkAttachments:
         - ctlplane
       preProvisioned: true