From d349777b97864d8aff1b412811438cb309395243 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Mon, 2 Oct 2023 10:09:33 -0400 Subject: [PATCH] Resolve conditionals bug in install docs - OSDOCS-2944 --- modules/installation-load-balancing-user-infra.adoc | 9 +++++++++ modules/installation-osp-downloading-modules.adoc | 6 ++++++ ...n-user-infra-generate-k8s-manifest-ignition.adoc | 6 ++++++ modules/nw-operator-cr.adoc | 2 +- .../nw-osp-configuring-external-load-balancer.adoc | 13 +++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/modules/installation-load-balancing-user-infra.adoc b/modules/installation-load-balancing-user-infra.adoc index dd4df47b5e..b6eae1eb12 100644 --- a/modules/installation-load-balancing-user-infra.adoc +++ b/modules/installation-load-balancing-user-infra.adoc @@ -255,6 +255,15 @@ If you are deploying a three-node cluster with zero compute nodes, the Ingress C If you are using HAProxy as a load balancer, you can check that the `haproxy` process is listening on ports `6443`, `22623`, `443`, and `80` by running `netstat -nltupe` on the HAProxy node. ==== +ifeval::["{context}" == "installing-vsphere"] +:!vsphere: +endif::[] +ifeval::["{context}" == "installing-restricted-networks-vsphere"] +:!vsphere: +endif::[] +ifeval::["{context}" == "installing-vsphere-network-customizations"] +:!vsphere: +endif::[] ifeval::["{context}" == "installing-ibm-z"] :!ibm-z: endif::[] diff --git a/modules/installation-osp-downloading-modules.adoc b/modules/installation-osp-downloading-modules.adoc index d463e74227..cdd0c48775 100644 --- a/modules/installation-osp-downloading-modules.adoc +++ b/modules/installation-osp-downloading-modules.adoc @@ -20,6 +20,9 @@ endif::[] ifeval::["{context}" == "uninstalling-openstack-user"] :osp-user-uninstall: endif::[] +ifeval::["{context}" == "uninstalling-cluster-openstack"] +:osp-user-uninstall: +endif::[] :_content-type: PROCEDURE [id="installation-osp-downloading-modules_{context}"] @@ -119,4 +122,7 @@ ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"] endif::[] ifeval::["{context}" == "uninstalling-cluster-openstack"] :!osp-user-uninstall: +endif::[] +ifeval::["{context}" == "uninstalling-openstack-user"] +:!osp-user-uninstall: endif::[] \ No newline at end of file diff --git a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc index d756d3fa0e..f9c47f4371 100644 --- a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc +++ b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc @@ -59,6 +59,9 @@ ifeval::["{context}" == "installing-restricted-networks-gcp"] :gcp: :restricted: endif::[] +ifeval::["{context}" == "installing-osp-user"] +:osp: +endif::[] ifeval::["{context}" == "installing-openstack-user"] :osp: endif::[] @@ -523,6 +526,9 @@ endif::[] ifeval::["{context}" == "installing-osp-user"] :!osp: endif::[] +ifeval::["{context}" == "installing-openstack-user"] +:!osp: +endif::[] ifeval::["{context}" == "installing-openstack-user-kuryr"] :!osp: endif::[] diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index 2d1da937c8..fd90d06256 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -440,7 +440,7 @@ ifeval::["{context}" == "cluster-network-operator"] :!operator: endif::[] -ifdef::post-install-network-configuration[] +ifeval::["{context}" == "post-install-network-configuration"] :!post-install-network-configuration: endif::[] ifeval::["{context}" == "installing-ibm-cloud-network-customizations"] diff --git a/modules/nw-osp-configuring-external-load-balancer.adoc b/modules/nw-osp-configuring-external-load-balancer.adoc index 054b6559a1..799e1b3f86 100644 --- a/modules/nw-osp-configuring-external-load-balancer.adoc +++ b/modules/nw-osp-configuring-external-load-balancer.adoc @@ -157,3 +157,16 @@ content-type: text/html; charset=utf-8 set-cookie: 1e2670d92730b515ce3a1bb65da45062=9b714eb87e93cf34853e87a92d6894be; path=/; HttpOnly; Secure; SameSite=None cache-control: private ---- + +ifeval::["{context}" == "installing-vsphere-installer-provisioned"] +:!vsphere: +endif::[] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] +:!vsphere: +endif::[] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +:!vsphere: +endif::[] +ifeval::["{context}" == installing-restricted-networks-installer-provisioned-vsphere] +:!vsphere: +endif::[] \ No newline at end of file