diff --git a/docs/modules/ROOT/partials/install/prepare-commodore.adoc b/docs/modules/ROOT/partials/install/prepare-commodore.adoc index 239ed2eb..17c1c810 100644 --- a/docs/modules/ROOT/partials/install/prepare-commodore.adoc +++ b/docs/modules/ROOT/partials/install/prepare-commodore.adoc @@ -42,6 +42,18 @@ yq eval -i ".parameters.openshift.baseDomain = \"${CLUSTER_DOMAIN}\"" \ git commit -a -m "Configure cluster domain for ${CLUSTER_ID}" ---- +. Include `openshift4.yml` in the cluster's config if it exists ++ +NOTE: For some tenants, this may already configure some of the settings shown in this how-to. ++ +[source,bash] +---- +if ls openshift4.y*ml 1>/dev/null 2>&1; then + yq eval -i '.classes += ".openshift4"' ${CLUSTER_ID}.yml; + git commit -a -m "Include openshift4 class for ${CLUSTER_ID}" +fi +---- + . Add Cilium to cluster configuration + [NOTE] diff --git a/docs/modules/ROOT/partials/install/prepare-syn-config.adoc b/docs/modules/ROOT/partials/install/prepare-syn-config.adoc index 4d989483..06449c7e 100644 --- a/docs/modules/ROOT/partials/install/prepare-syn-config.adoc +++ b/docs/modules/ROOT/partials/install/prepare-syn-config.adoc @@ -5,15 +5,6 @@ pushd "inventory/classes/${TENANT_ID}/" ---- -. Include openshift4.yml if it exists -+ -[source,bash] ----- -if ls openshift4.y*ml 1>/dev/null 2>&1; then - yq eval -i '.classes += ".openshift4"' ${CLUSTER_ID}.yml; -fi ----- - . Include no-opsgenie class to prevent monitoring noise during cluster setup + [source,bash]