From 7378e104cbba76e993615dec0367697a6194f0de Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Wed, 1 Nov 2023 09:01:15 +0100 Subject: [PATCH] Add steps to remove the initial worker machineset in OpenStack install instructions --- docs/modules/ROOT/partials/install/finalize_part2.adoc | 5 ++++- .../{finalize_part2_vsphere.adoc => finalize_part2_ipi.adoc} | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) rename docs/modules/ROOT/partials/install/{finalize_part2_vsphere.adoc => finalize_part2_ipi.adoc} (97%) diff --git a/docs/modules/ROOT/partials/install/finalize_part2.adoc b/docs/modules/ROOT/partials/install/finalize_part2.adoc index d2e5cef2..8359b7c6 100644 --- a/docs/modules/ROOT/partials/install/finalize_part2.adoc +++ b/docs/modules/ROOT/partials/install/finalize_part2.adoc @@ -7,7 +7,10 @@ ifeval::["{provider}" == "exoscale"] include::partial$install/finalize_part2_cloudscale_exoscale.adoc[] endif::[] ifeval::["{provider}" == "vsphere"] -include::partial$install/finalize_part2_vsphere.adoc[] +include::partial$install/finalize_part2_ipi.adoc[] +endif::[] +ifeval::["{provider}" == "openstack"] +include::partial$install/finalize_part2_ipi.adoc[] endif::[] . Delete local config files diff --git a/docs/modules/ROOT/partials/install/finalize_part2_vsphere.adoc b/docs/modules/ROOT/partials/install/finalize_part2_ipi.adoc similarity index 97% rename from docs/modules/ROOT/partials/install/finalize_part2_vsphere.adoc rename to docs/modules/ROOT/partials/install/finalize_part2_ipi.adoc index a930fd1a..1290d679 100644 --- a/docs/modules/ROOT/partials/install/finalize_part2_vsphere.adoc +++ b/docs/modules/ROOT/partials/install/finalize_part2_ipi.adoc @@ -57,6 +57,7 @@ kubectl get pods -A | grep -vw -e Running -e Completed kubectl -n openshift-machine-api delete machineset ${INFRA_ID}-worker ---- +ifeval::["{provider}" == "vsphere"] . Clean up the vSphere CA certificate + [source,bash] @@ -64,3 +65,4 @@ kubectl -n openshift-machine-api delete machineset ${INFRA_ID}-worker for cert in certs/lin/*.0; do sudo rm /usr/local/share/ca-certificates/$(basename ${cert}.crt); done sudo update-ca-certificates ---- +endif::[]