Merge pull request #64917 from mjpytlak/osdocs-7806

Revert "Temporarily remove Support for FIPS cryptography topic"

Author: mjpytlak

_topic_maps/_topic_map.yml

@@ -510,6 +510,9 @@ Topics:
 - Name: Troubleshooting installation issues
   File: installing-troubleshooting
   Distros: openshift-origin,openshift-enterprise
+- Name: Support for FIPS cryptography
+  File: installing-fips
+  Distros: openshift-enterprise,openshift-online
 ---
 Name: Post-installation configuration
 Dir: post_installation_configuration

installing/install_config/installing-customizing.adoc

@@ -52,9 +52,6 @@ include::modules/installation-special-config-chrony.adoc[leveloffset=+1]
 
 * For information on Butane, see xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-butane_installing-customizing[Creating machine configs with Butane].
 
-////
 ifndef::openshift-origin[]
 * For information on FIPS support, see xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography].
 endif::[]
-
-////

installing/installing-preparing.adoc

@@ -25,8 +25,8 @@ endif::openshift-origin[]
 * Microsoft Azure on 64-bit x86 instances
 * Microsoft Azure on 64-bit ARM instances
 * Microsoft Azure Stack Hub
-* Google Cloud Platform (GCP) on 64-bit x86 instances 
-* Google Cloud Platform (GCP) on 64-bit ARM instances 
+* Google Cloud Platform (GCP) on 64-bit x86 instances
+* Google Cloud Platform (GCP) on 64-bit ARM instances
 * {rh-openstack-first}
 * IBM Cloud VPC
 * {ibmzProductName} or {linuxoneProductName}
@@ -77,12 +77,11 @@ If you use a user-provisioned installation method, you can configure a proxy for
 
 If you want to prevent your cluster on a public cloud from exposing endpoints externally, you can deploy a private cluster with installer-provisioned infrastructure on xref:../installing/installing_aws/installing-aws-private.adoc#installing-aws-private[AWS], xref:../installing/installing_azure/installing-azure-private.adoc#installing-azure-private[Azure], or xref:../installing/installing_gcp/installing-gcp-private.adoc#installing-gcp-private[GCP].
 
-If you need to install your cluster that has limited access to the internet, such as a disconnected or restricted network cluster, you can xref:../installing/disconnected_install/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[mirror the installation packages] and install the cluster from them. Follow detailed instructions for user provisioned infrastructure installations into restricted networks for xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[GCP], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{ibmzProductName} or {linuxoneProductName}], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibmzProductName} or {linuxoneProductName} with {op-system-base} KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[IBM Power], xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal]. You can also install a cluster into a restricted network using installer-provisioned infrastructure by following detailed instructions for xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[GCP], xref:../installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc#installing-restricted-networks-nutanix-installer-provisioned[Nutanix, xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[{rh-openstack}], and xref:../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[vSphere].
+If you need to install your cluster that has limited access to the internet, such as a disconnected or restricted network cluster, you can xref:../installing/disconnected_install/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[mirror the installation packages] and install the cluster from them. Follow detailed instructions for user provisioned infrastructure installations into restricted networks for xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[GCP], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{ibmzProductName} or {linuxoneProductName}], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibmzProductName} or {linuxoneProductName} with {op-system-base} KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[IBM Power], xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal]. You can also install a cluster into a restricted network using installer-provisioned infrastructure by following detailed instructions for xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[GCP], xref:../installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc#installing-restricted-networks-nutanix-installer-provisioned[Nutanix], xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[{rh-openstack}], and xref:../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[vSphere].
 
 
 If you need to deploy your cluster to an xref:../installing/installing_aws/installing-aws-government-region.adoc#installing-aws-government-region[AWS GovCloud region], xref:../installing/installing_aws/installing-aws-china.adoc#installing-aws-china-region[AWS China region], or xref:../installing/installing_azure/installing-azure-government-region.adoc#installing-azure-government-region[Azure government region], you can configure those custom regions during an installer-provisioned infrastructure installation.
 
-////
 ifndef::openshift-origin[]
 You can also configure the cluster machines to use xref:../installing/installing-fips.adoc#installing-fips[FIPS Validated / Modules in Process cryptographic libraries] during installation.
 
@@ -92,7 +91,6 @@ The use of FIPS Validated / Modules in Process cryptographic libraries is only s
 ====
 
 endif::[]
-////
 
 ////
 [id="installing-preparing-single-node"]

installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc

@@ -33,9 +33,7 @@ include::modules/agent-installer-configuring-fips-compliance.adoc[leveloffset=+1
 
 * link:https://access.redhat.com/articles/5059881[OpenShift Security Guide Book]
 
-////
 * xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
-////
 
 include::modules/agent-install-networking.adoc[leveloffset=+1]
 

operators/operator_sdk/osdk-generating-csvs.adoc

@@ -41,9 +41,7 @@ include::modules/osdk-csv-manual-annotations.adoc[leveloffset=+2]
 * xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#osdk-suggested-namespace-default-node_osdk-generating-csvs[Setting a suggested namespace with default node selector]
 * xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#olm-enabling-operator-for-restricted-network_osdk-generating-csvs[Enabling your Operator for restricted network environments] (disconnected mode)
 * xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#osdk-hiding-internal-objects_osdk-generating-csvs[Hiding internal objects]
-////
 * xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS crytography]
-////
 
 include::modules/olm-enabling-operator-restricted-network.adoc[leveloffset=+1]
 include::modules/olm-enabling-operator-for-multi-arch.adoc[leveloffset=+1]

security/container_security/security-compliance.adoc

@@ -13,12 +13,9 @@ standards or the organization's corporate governance framework.
 
 // Compliance and the NIST risk management model
 include::modules/security-compliance-nist.adoc[leveloffset=+1]
-
-////
 ifndef::openshift-origin[]
 
 [role="_additional-resources"]
 .Additional resources
 * xref:../../installing/installing-fips.adoc#installing-fips-mode_installing-fips[Installing a cluster in FIPS mode]
 endif::[]
-////

security/container_security/security-hardening.adoc

@@ -44,8 +44,6 @@ include::modules/security-hardening-how.adoc[leveloffset=+1]
 * xref:../../nodes/nodes/nodes-nodes-managing.adoc#nodes-nodes-kernel-arguments_nodes-nodes-managing[Adding kernel arguments to Nodes]
 ifndef::openshift-origin[]
 * xref:../../installing/installing_aws/installing-aws-customizations.adoc#installation-configuration-parameters_installing-aws-customizations[Installation configuration parameters] - see `fips`
+* xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
 * link:https://access.redhat.com/articles/3359851[{op-system-base} core crypto components]
-////
- * xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
-////
 endif::[]

security/container_security/security-hosts-vms.adoc

@@ -29,11 +29,9 @@ include::modules/security-hosts-vms-rhcos.adoc[leveloffset=+1]
 * xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-encrypt-disk_installing-customizing[Disk encryption]
 * xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Chrony time service]
 * xref:../../updating/understanding_updates/intro-to-updates.adoc#update-service-about_understanding-openshift-updates[About the OpenShift Update Service]
-////
 ifndef::openshift-origin[]
 * xref:../../installing/installing-fips.adoc#installing-fips[FIPS cryptography]
 endif::[]
-////
 
 // Virtualization versus containers
 include::modules/security-hosts-vms-vs-containers.adoc[leveloffset=+1]

virt/install/preparing-cluster-for-virt.adoc

@@ -21,11 +21,9 @@ IPv6::
 You cannot run {VirtProductName} on a single-stack IPv6 cluster.
 ====
 
-////
 .FIPS mode
 
 If you install your cluster in xref:../../installing/installing-fips.adoc#installing-fips-mode_installing-fips[FIPS mode], no additional setup is required for {VirtProductName}.
-////
 
 // Section is in assembly so that we can use xrefs
 [id="virt-hardware-os-requirements_preparing-cluster-for-virt"]