From 2e65d00affe01e1e0757cbf6cbe62c11d73790eb Mon Sep 17 00:00:00 2001 From: Andre Aranha Date: Tue, 14 May 2024 14:45:02 +0200 Subject: [PATCH] Fixing the adopting the data plane doc Fixing the command to deploy a standalone environment with TLS, create rootca-internal secret on openstack namespace. --- docs_dev/assemblies/development_environment.adoc | 4 +++- docs_user/modules/proc_migrating-tls-everywhere.adoc | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs_dev/assemblies/development_environment.adoc b/docs_dev/assemblies/development_environment.adoc index 4d8319332..cb8028c19 100644 --- a/docs_dev/assemblies/development_environment.adoc +++ b/docs_dev/assemblies/development_environment.adoc @@ -143,9 +143,11 @@ To deploy using TLS everywhere enabled, instead run: [,bash] ---- cd ~/install_yamls/devsetup -TLS_ENABLED=true make standalone +EDPM_COMPUTE_CEPH_ENABLED=false TLS_ENABLED=true DNS_DOMAIN=ooo.test make standalone ---- +This will disable the Ceph deployment, as the CI is not deploying with Ceph. + == Install the openstack-k8s-operators (openstack-operator) [,bash] diff --git a/docs_user/modules/proc_migrating-tls-everywhere.adoc b/docs_user/modules/proc_migrating-tls-everywhere.adoc index 8e2fd4bf6..13b193f81 100644 --- a/docs_user/modules/proc_migrating-tls-everywhere.adoc +++ b/docs_user/modules/proc_migrating-tls-everywhere.adoc @@ -46,6 +46,12 @@ endif::[] + [subs=+quotes] ---- +ifeval::["{build}" != "downstream"] +EDPM_PRIVATEKEY_PATH="~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa" +endif::[] +ifeval::["{build}" == "downstream"] +EDPM_PRIVATEKEY_PATH="**" +endif::[] declare -A computes computes=( ["standalone.localdomain"]="192.168.122.100" @@ -90,7 +96,7 @@ With that file, you can also separately get the certificate and the key by using . Create the secret that contains the root CA: + ---- -oc create secret generic rootca-internal +oc create secret generic rootca-internal -n openstack ---- . Import the certificate and the key from FreeIPA: