diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 5d0876acbd..7162579c07 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -346,7 +346,7 @@ Topics: - Name: Installing a GCP cluster with the support for configuring multi-architecture compute machines File: installing-gcp-multiarch-support - Name: Installing on IBM Cloud - Dir: installing_ibm_cloud_public + Dir: installing_ibm_cloud Distros: openshift-origin,openshift-enterprise Topics: - Name: Preparing to install on IBM Cloud @@ -454,7 +454,7 @@ Topics: - Name: Expanding the cluster File: ipi-install-expanding-the-cluster - Name: Installing IBM Cloud Bare Metal (Classic) - Dir: installing_ibm_cloud + Dir: installing_ibm_cloud_classic Distros: openshift-origin,openshift-enterprise Topics: - Name: Prerequisites @@ -1719,9 +1719,9 @@ Topics: File: persistent-storage-csi-gcp-pd - Name: GCP Filestore CSI Driver Operator File: persistent-storage-csi-google-cloud-file - - Name: IBM VPC Block CSI Driver Operator + - Name: IBM Cloud Block Storage (VPC) CSI Driver Operator File: persistent-storage-csi-ibm-vpc-block - - Name: IBM Power Virtual Server Block CSI Driver Operator + - Name: IBM Power Virtual Server Block Storage CSI Driver Operator File: persistent-storage-csi-ibm-powervs-block - Name: OpenStack Cinder CSI Driver Operator File: persistent-storage-csi-cinder diff --git a/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc b/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc index dca317d61b..04ddfd66ff 100644 --- a/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc +++ b/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc @@ -29,7 +29,7 @@ An AWS, global Azure, or GCP cluster that uses manual mode might be configured t * xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS] * xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure] * xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for GCP] -* xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}] * xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#manually-create-iam-nutanix_installing-nutanix-installer-provisioned[Configuring IAM for Nutanix] * xref:../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components] * xref:../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#preparing-manual-creds-update[Preparing to update a cluster with manually maintained credentials] \ No newline at end of file diff --git a/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc b/installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc similarity index 88% rename from installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc rename to installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc index 27b172d622..d5c3ec0ee6 100644 --- a/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc +++ b/installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc @@ -24,7 +24,7 @@ include::modules/cco-ccoctl-configuring.adoc[leveloffset=+1] [id="next-steps_configuring-iam-ibm-cloud"] == Next steps -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-name} with customizations] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-name} with customizations] [role="_additional-resources"] [id="additional-resources_{context}"] diff --git a/installing/installing_ibm_cloud/images b/installing/installing_ibm_cloud/images index 847b03ed05..5fa6987088 120000 --- a/installing/installing_ibm_cloud/images +++ b/installing/installing_ibm_cloud/images @@ -1 +1 @@ -../../images/ \ No newline at end of file +../../images \ No newline at end of file diff --git a/installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc b/installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc similarity index 100% rename from installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc rename to installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc similarity index 90% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc index b0cf739aca..4184dc80a2 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc @@ -33,4 +33,4 @@ include::modules/installation-ibm-cloud-regions.adoc[leveloffset=+1] [id="next-steps_installing-ibm-cloud-account"] == Next steps -* xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc similarity index 87% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc index 0ad4f0b1a2..58fb502d4a 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc @@ -13,9 +13,9 @@ In {product-title} version {product-version}, you can install a customized clust * You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. * You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. +* You xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. * If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. +* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. include::modules/cluster-entitlements.adoc[leveloffset=+1] @@ -29,7 +29,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc similarity index 89% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc index 4f39bf8a35..de2a5c5c18 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc @@ -16,9 +16,9 @@ You must set most of the network configuration parameters during installation, a * You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. * You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. +* You xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. * If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. +* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. include::modules/cluster-entitlements.adoc[leveloffset=+1] @@ -32,7 +32,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc similarity index 87% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc index e34459829d..bdcfbb146b 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc @@ -13,9 +13,9 @@ In {product-title} version {product-version}, you can install a private cluster * You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. * You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. +* You xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. * If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. +* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. include::modules/private-clusters-default.adoc[leveloffset=+1] @@ -35,7 +35,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc similarity index 80% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc index 88f58942f0..b541c163c6 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc @@ -1,7 +1,7 @@ -:_content-type: ASSEMBLY +:_mod-docs-content-type: ASSEMBLY include::_attributes/common-attributes.adoc[] [id="installing-ibm-cloud-restricted"] -= Installing a cluster on IBM Cloud in a restricted network += Installing a cluster on {ibm-cloud-title} in a restricted network :context: installing-ibm-cloud-restricted toc::[] @@ -12,26 +12,26 @@ In {product-title} {product-version}, you can install a cluster in a restricted == Prerequisites * You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -* You xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an IBM Cloud account] to host the cluster. +* You xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-title} account] to host the cluster. * You have a container image registry that is accessible to the internet and your restricted network. The container image registry should mirror the contents of the {product-registry} and contain the installation media. For more information, see xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#installing-mirroring-disconnected[Mirroring images for a disconnected installation using the oc-mirror plugin]. * You have an existing VPC on {ibm-cloud-name} that meets the following requirements: ** The VPC contains the mirror registry or has firewall rules or a peering connection to access the mirror registry that is hosted elsewhere. -** The VPC can access {ibm-cloud-name} service endpoints using a public endpoint. If network restrictions limit access to public service endpoints, evaluate those services for alternate endpoints that might be available. For more information see xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#access-to-ibm-service-endpoints_installing-ibm-cloud-restricted[Access to IBM service endpoints]. +** The VPC can access {ibm-cloud-name} service endpoints using a public endpoint. If network restrictions limit access to public service endpoints, evaluate those services for alternate endpoints that might be available. For more information see xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#access-to-ibm-service-endpoints_installing-ibm-cloud-restricted[Access to IBM service endpoints]. + You cannot use the VPC that the installation program provisions by default. * If you plan on configuring endpoint gateways to use {ibm-cloud-name} Virtual Private Endpoints, consider the following requirements: ** Endpoint gateway support is currently limited to the `us-east` and `us-south` regions. -** The VPC must allow traffic to and from the endpoint gateways. You can use the VPC’s default security group, or a new security group, to allow traffic on port 443. For more information, see xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installation-ibm-cloud-configure-vpc-for-endpoint-gateways_installing-ibm-cloud-restricted[Allowing endpoint gateway traffic]. +** The VPC must allow traffic to and from the endpoint gateways. You can use the VPC’s default security group, or a new security group, to allow traffic on port 443. For more information, see xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installation-ibm-cloud-configure-vpc-for-endpoint-gateways_installing-ibm-cloud-restricted[Allowing endpoint gateway traffic]. * If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for IBM Cloud VPC]. +* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-title}]. include::modules/installation-about-restricted-network.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#installing-mirroring-disconnected[Mirroring images for a disconnected installation using the oc-mirror plugin] -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-configuration-parameters-additional-ibm-cloud_installation-config-parameters-ibm-cloud-vpc[Additional IBM Cloud configuration parameters] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-configuration-parameters-additional-ibm-cloud_installation-config-parameters-ibm-cloud-vpc[Additional {ibm-cloud-title} configuration parameters] include::modules/installation-custom-ibm-cloud-vpc.adoc[leveloffset=+1] include::modules/installation-ibm-cloud-configure-vpc-for-endpoint-gateways.adoc[leveloffset=+2] @@ -48,7 +48,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc b/installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc similarity index 87% rename from installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc rename to installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc index a7fab2396d..aee2bc5507 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc +++ b/installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc @@ -13,9 +13,9 @@ In {product-title} version {product-version}, you can install a cluster into an * You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. * You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. +* You xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[configured an {ibm-cloud-name} account] to host the cluster. * If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. +* You configured the `ccoctl` utility before you installed the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. include::modules/installation-custom-ibm-cloud-vpc.adoc[leveloffset=+1] @@ -31,7 +31,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for {ibm-cloud-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_cloud/modules b/installing/installing_ibm_cloud/modules index 36719b9de7..8b0e854007 120000 --- a/installing/installing_ibm_cloud/modules +++ b/installing/installing_ibm_cloud/modules @@ -1 +1 @@ -../../modules/ \ No newline at end of file +../../modules \ No newline at end of file diff --git a/installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc b/installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc new file mode 100644 index 0000000000..1f5ae54be4 --- /dev/null +++ b/installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc @@ -0,0 +1,49 @@ +:_mod-docs-content-type: ASSEMBLY +include::_attributes/common-attributes.adoc[] +[id="preparing-to-install-on-ibm-cloud"] += Preparing to install on {ibm-cloud-title} +:context: preparing-to-install-on-ibm-cloud + +toc::[] + +The installation workflows documented in this section are for {ibm-cloud-name} infrastructure environments. {ibm-cloud-name} classic is not supported at this time. For more information about the difference between classic and VPC infrastructures, see the {ibm-name} link:https://cloud.ibm.com/docs/cloud-infrastructure?topic=cloud-infrastructure-compare-infrastructure[documentation]. + +[id="prerequisites_preparing-to-install-on-ibm-cloud"] +== Prerequisites + +* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. + +* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. + +[id="requirements-for-installing-ocp-on-ibm-cloud"] +== Requirements for installing {product-title} on {ibm-cloud-title} + +Before installing {product-title} on {ibm-cloud-name}, you must create a service account and configure an {ibm-cloud-name} account. See xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[Configuring an {ibm-cloud-name} account] for details about creating an account, enabling API services, configuring DNS, {ibm-cloud-name} account limits, and supported {ibm-cloud-name} regions. + +You must manually manage your cloud credentials when installing a cluster to {ibm-cloud-name}. Do this by configuring the Cloud Credential Operator (CCO) for manual mode before you install the cluster. For more information, see xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. + +[id="choosing-a-method-to-install-ocp-on-ibm-cloud"] +== Choosing a method to install {product-title} on {ibm-cloud-title} + +You can install {product-title} on {ibm-cloud-name} using installer-provisioned infrastructure. This process involves using an installation program to provision the underlying infrastructure for your cluster. Installing {product-title} on {ibm-cloud-name} using user-provisioned infrastructure is not supported at this time. + +See xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process] for more information about installer-provisioned installation processes. + +[id="choosing-an-method-to-install-ocp-on-ibm-cloud-installer-provisioned"] +=== Installing a cluster on installer-provisioned infrastructure + +You can install a cluster on {ibm-cloud-name} infrastructure that is provisioned by the {product-title} installation program by using one of the following methods: + +* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a customized cluster on {ibm-cloud-name}]**: You can install a customized cluster on {ibm-cloud-name} infrastructure that the installation program provisions. The installation program allows for some customization to be applied at the installation stage. Many other customization options are available xref:../../post_installation_configuration/cluster-tasks.adoc#post-install-cluster-tasks[post-installation]. + +* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-name} with network customizations]**: You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements. + +* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-name} into an existing VPC]**: You can install {product-title} on an existing {ibm-cloud-name}. You can use this installation method if you have constraints set by the guidelines of your company, such as limits when creating new accounts or infrastructure. + +* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[Installing a private cluster on an existing VPC]**: You can install a private cluster on an existing Virtual Private Cloud (VPC). You can use this method to deploy {product-title} on an internal network that is not visible to the internet. + +* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[Installing a cluster on {ibm-cloud-title} in a restricted network]**: You can install {product-title} on {ibm-cloud-title} on installer-provisioned infrastructure by using an internal mirror of the installation release content. You can use this method to install a cluster that does not require an active internet connection to obtain the software components. + +[id="next-steps_preparing-to-install-on-ibm-cloud"] +== Next steps +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[Configuring an {ibm-cloud-name} account] diff --git a/installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc b/installing/installing_ibm_cloud/uninstalling-cluster-ibm-cloud.adoc similarity index 100% rename from installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc rename to installing/installing_ibm_cloud/uninstalling-cluster-ibm-cloud.adoc diff --git a/installing/installing_ibm_cloud_public/user-managed-encryption-ibm-cloud.adoc b/installing/installing_ibm_cloud/user-managed-encryption-ibm-cloud.adoc similarity index 55% rename from installing/installing_ibm_cloud_public/user-managed-encryption-ibm-cloud.adoc rename to installing/installing_ibm_cloud/user-managed-encryption-ibm-cloud.adoc index 36f75c5b28..576e9bb14d 100644 --- a/installing/installing_ibm_cloud_public/user-managed-encryption-ibm-cloud.adoc +++ b/installing/installing_ibm_cloud/user-managed-encryption-ibm-cloud.adoc @@ -23,11 +23,11 @@ When specified as part of the default machine configuration, all managed storage * Separate root keys be used for the control plane and compute machine pools. -For more information about the `encryptionKey` parameter, see xref:../../installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-configuration-parameters-additional-ibm-cloud_installation-config-parameters-ibm-cloud-vpc[Additional IBM Cloud configuration parameters]. +For more information about the `encryptionKey` parameter, see xref:../../installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vpc.adoc#installation-configuration-parameters-additional-ibm-cloud_installation-config-parameters-ibm-cloud-vpc[Additional {ibm-cloud-title} configuration parameters]. [NOTE] ==== -Make sure you have integrated Key Protect with your IBM Cloud Block Storage service. For more information, see the Key Protect link:https://cloud.ibm.com/docs/key-protect?topic=key-protect-integrate-services#grant-access[documentation]. +Make sure you have integrated Key Protect with your {ibm-cloud-title} Block Storage service. For more information, see the Key Protect link:https://cloud.ibm.com/docs/key-protect?topic=key-protect-integrate-services#grant-access[documentation]. ==== @@ -36,7 +36,7 @@ Make sure you have integrated Key Protect with your IBM Cloud Block Storage serv Install an {product-title} cluster: -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-title} with customizations] -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-title} with network customizations] -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-title} into an existing VPC] -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[Installing a private cluster on {ibm-cloud-title}] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-title} with customizations] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-title} with network customizations] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-title} into an existing VPC] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[Installing a private cluster on {ibm-cloud-title}] diff --git a/installing/installing_ibm_cloud_public/_attributes b/installing/installing_ibm_cloud_classic/_attributes similarity index 100% rename from installing/installing_ibm_cloud_public/_attributes rename to installing/installing_ibm_cloud_classic/_attributes diff --git a/installing/installing_ibm_cloud_classic/images b/installing/installing_ibm_cloud_classic/images new file mode 120000 index 0000000000..847b03ed05 --- /dev/null +++ b/installing/installing_ibm_cloud_classic/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/installing/installing_ibm_cloud/install-ibm-cloud-installation-workflow.adoc b/installing/installing_ibm_cloud_classic/install-ibm-cloud-installation-workflow.adoc similarity index 74% rename from installing/installing_ibm_cloud/install-ibm-cloud-installation-workflow.adoc rename to installing/installing_ibm_cloud_classic/install-ibm-cloud-installation-workflow.adoc index ebbd52a68f..c07693205c 100644 --- a/installing/installing_ibm_cloud/install-ibm-cloud-installation-workflow.adoc +++ b/installing/installing_ibm_cloud_classic/install-ibm-cloud-installation-workflow.adoc @@ -6,15 +6,15 @@ include::_attributes/common-attributes.adoc[] toc::[] -include::modules/install-ibm-cloud-preparing-the-provisioner-node.adoc[leveloffset=+1] +include::modules/install-ibm-cloud-classic-preparing-the-provisioner-node.adoc[leveloffset=+1] -include::modules/install-ibm-cloud-configuring-the-public-subnet.adoc[leveloffset=+1] +include::modules/install-ibm-cloud-classic-configuring-the-public-subnet.adoc[leveloffset=+1] include::modules/ipi-install-retrieving-the-openshift-installer.adoc[leveloffset=+1] include::modules/ipi-install-extracting-the-openshift-installer.adoc[leveloffset=+1] -include::modules/install-ibm-cloud-configuring-the-install-config-file.adoc[leveloffset=+1] +include::modules/install-ibm-cloud-classic-configuring-the-install-config-file.adoc[leveloffset=+1] include::modules/ipi-install-additional-install-config-parameters.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc b/installing/installing_ibm_cloud_classic/install-ibm-cloud-prerequisites.adoc similarity index 91% rename from installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc rename to installing/installing_ibm_cloud_classic/install-ibm-cloud-prerequisites.adoc index f798066e41..80ba101572 100644 --- a/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc +++ b/installing/installing_ibm_cloud_classic/install-ibm-cloud-prerequisites.adoc @@ -22,4 +22,4 @@ Installer-provisioned installation of {product-title} requires: Before starting an installer-provisioned installation of {product-title} on {ibm-cloud-bm}, address the following prerequisites and requirements. -include::modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc[leveloffset=+1] +include::modules/install-ibm-cloud-classic-setting-up-ibm-cloud-infrastructure.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_cloud_classic/modules b/installing/installing_ibm_cloud_classic/modules new file mode 120000 index 0000000000..36719b9de7 --- /dev/null +++ b/installing/installing_ibm_cloud_classic/modules @@ -0,0 +1 @@ +../../modules/ \ No newline at end of file diff --git a/installing/installing_ibm_cloud_public/snippets b/installing/installing_ibm_cloud_classic/snippets similarity index 100% rename from installing/installing_ibm_cloud_public/snippets rename to installing/installing_ibm_cloud_classic/snippets diff --git a/installing/installing_ibm_cloud_public/images b/installing/installing_ibm_cloud_public/images deleted file mode 120000 index 5fa6987088..0000000000 --- a/installing/installing_ibm_cloud_public/images +++ /dev/null @@ -1 +0,0 @@ -../../images \ No newline at end of file diff --git a/installing/installing_ibm_cloud_public/modules b/installing/installing_ibm_cloud_public/modules deleted file mode 120000 index 8b0e854007..0000000000 --- a/installing/installing_ibm_cloud_public/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules \ No newline at end of file diff --git a/installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc b/installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc deleted file mode 100644 index 7fa81e2569..0000000000 --- a/installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc +++ /dev/null @@ -1,49 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -include::_attributes/common-attributes.adoc[] -[id="preparing-to-install-on-ibm-cloud"] -= Preparing to install on {ibm-cloud-title} -:context: preparing-to-install-on-ibm-cloud - -toc::[] - -The installation workflows documented in this section are for {ibm-cloud-name} infrastructure environments. {ibm-cloud-name} classic is not supported at this time. For more information about the difference between classic and VPC infrastructures, see the {ibm-name} link:https://cloud.ibm.com/docs/cloud-infrastructure?topic=cloud-infrastructure-compare-infrastructure[documentation]. - -[id="prerequisites_preparing-to-install-on-ibm-cloud"] -== Prerequisites - -* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. - -* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. - -[id="requirements-for-installing-ocp-on-ibm-cloud"] -== Requirements for installing {product-title} on {ibm-cloud-title} - -Before installing {product-title} on {ibm-cloud-name}, you must create a service account and configure an {ibm-cloud-name} account. See xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[Configuring an {ibm-cloud-name} account] for details about creating an account, enabling API services, configuring DNS, {ibm-cloud-name} account limits, and supported {ibm-cloud-name} regions. - -You must manually manage your cloud credentials when installing a cluster to {ibm-cloud-name}. Do this by configuring the Cloud Credential Operator (CCO) for manual mode before you install the cluster. For more information, see xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]. - -[id="choosing-a-method-to-install-ocp-on-ibm-cloud"] -== Choosing a method to install {product-title} on {ibm-cloud-title} - -You can install {product-title} on {ibm-cloud-name} using installer-provisioned infrastructure. This process involves using an installation program to provision the underlying infrastructure for your cluster. Installing {product-title} on {ibm-cloud-name} using user-provisioned infrastructure is not supported at this time. - -See xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process] for more information about installer-provisioned installation processes. - -[id="choosing-an-method-to-install-ocp-on-ibm-cloud-installer-provisioned"] -=== Installing a cluster on installer-provisioned infrastructure - -You can install a cluster on {ibm-cloud-name} infrastructure that is provisioned by the {product-title} installation program by using one of the following methods: - -* **xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a customized cluster on {ibm-cloud-name}]**: You can install a customized cluster on {ibm-cloud-name} infrastructure that the installation program provisions. The installation program allows for some customization to be applied at the installation stage. Many other customization options are available xref:../../post_installation_configuration/cluster-tasks.adoc#post-install-cluster-tasks[post-installation]. - -* **xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-name} with network customizations]**: You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements. - -* **xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-name} into an existing VPC]**: You can install {product-title} on an existing {ibm-cloud-name}. You can use this installation method if you have constraints set by the guidelines of your company, such as limits when creating new accounts or infrastructure. - -* **xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[Installing a private cluster on an existing VPC]**: You can install a private cluster on an existing Virtual Private Cloud (VPC). You can use this method to deploy {product-title} on an internal network that is not visible to the internet. - -* **xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[Installing a cluster on IBM Cloud VPC in a restricted network]**: You can install {product-title} on IBM Cloud VPC on installer-provisioned infrastructure by using an internal mirror of the installation release content. You can use this method to install a cluster that does not require an active internet connection to obtain the software components. - -[id="next-steps_preparing-to-install-on-ibm-cloud"] -== Next steps -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[Configuring an {ibm-cloud-name} account] diff --git a/installing/overview/installing-fips.adoc b/installing/overview/installing-fips.adoc index 0bde731779..1ddaeb96cf 100644 --- a/installing/overview/installing-fips.adoc +++ b/installing/overview/installing-fips.adoc @@ -97,7 +97,7 @@ To enable FIPS mode for your cluster, you must run the installation program from * xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Microsoft Azure] * xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Bare metal] * xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[Google Cloud Platform] -* xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[{ibm-cloud-name}] +* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[{ibm-cloud-name}] * xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[{ibm-power-name}] * xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} and {ibm-linuxone-name}] * xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM] diff --git a/installing/overview/installing-preparing.adoc b/installing/overview/installing-preparing.adoc index 2c5153699e..81c5e32bdf 100644 --- a/installing/overview/installing-preparing.adoc +++ b/installing/overview/installing-preparing.adoc @@ -77,7 +77,7 @@ 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/ipi/installing-aws-private.adoc#installing-aws-private[AWS], xref:../../installing/installing_azure/ipi/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:../../disconnected/mirroring/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/upi/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[{ibm-z-name} or {ibm-linuxone-name}], xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibm-z-name} or {ibm-linuxone-name} with {op-system-base} KVM], xref:../../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibm-power-name}], xref:../../installing/installing_vsphere/upi/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/ipi/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_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}], 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/ipi/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:../../disconnected/mirroring/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/upi/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[{ibm-z-name} or {ibm-linuxone-name}], xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibm-z-name} or {ibm-linuxone-name} with {op-system-base} KVM], xref:../../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibm-power-name}], xref:../../installing/installing_vsphere/upi/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/ipi/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_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}], 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/ipi/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/ipi/installing-aws-government-region.adoc#installing-aws-government-region[AWS GovCloud region], xref:../../installing/installing_aws/ipi/installing-aws-china.adoc#installing-aws-china-region[AWS China region], or xref:../../installing/installing_azure/ipi/installing-azure-government-region.adoc#installing-azure-government-region[Azure government region], you can configure those custom regions during an installer-provisioned infrastructure installation. @@ -146,7 +146,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[✓] |xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[✓] |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] | | | @@ -164,7 +164,7 @@ ifndef::openshift-origin[] | | |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] | | |xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc#installing-ibm-power-vs-customizations[✓] @@ -183,7 +183,7 @@ ifndef::openshift-origin[] | | |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] | | | @@ -201,7 +201,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#ipi-install-installation-workflow[✓] |xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#ipi-install-installation-workflow[✓] |xref:../../installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[✓] | | |xref:../../installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc#installing-restricted-networks-ibm-power-vs[✓] @@ -219,7 +219,7 @@ ifndef::openshift-origin[] | | | -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[✓] | | |xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc#installing-ibm-power-vs-private-cluster[✓] @@ -237,7 +237,7 @@ ifndef::openshift-origin[] | | | -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[✓] | | |xref:../../installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc#installing-ibm-powervs-vpc[✓] @@ -313,7 +313,7 @@ ifdef::openshift-origin[] | |xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[✓] |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] | | @@ -326,7 +326,7 @@ ifdef::openshift-origin[] |xref:../../installing/installing_openstack/installing-openstack-installer-custom.adoc#installing-openstack-installer-custom[✓] | |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓] | | @@ -339,7 +339,7 @@ ifdef::openshift-origin[] | | |xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] | | @@ -352,7 +352,7 @@ ifdef::openshift-origin[] |xref:../../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[✓] | |xref:../../installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[✓] -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[✓] | | @@ -365,7 +365,7 @@ ifdef::openshift-origin[] | | | -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[✓] | | @@ -378,7 +378,7 @@ ifdef::openshift-origin[] | | | -|xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[✓] +|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[✓] | | diff --git a/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc b/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc index 20ebffdeb2..99682603c7 100644 --- a/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc +++ b/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc @@ -11,7 +11,7 @@ You can create a different compute machine set to serve a specific purpose in yo //[IMPORTANT] admonition for UPI include::modules/machine-user-provisioned-limitations.adoc[leveloffset=+1] -//Sample YAML for a machine set custom resource on IBM Cloud +//Sample YAML for a machine set custom resource on {ibm-cloud-title} include::modules/machineset-yaml-ibm-cloud.adoc[leveloffset=+1] //Creating a compute machine set diff --git a/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc b/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc index c4773e4b91..5672dd4879 100644 --- a/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc +++ b/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc @@ -11,7 +11,7 @@ You can create a different compute machine set to serve a specific purpose in yo //[IMPORTANT] admonition for UPI include::modules/machine-user-provisioned-limitations.adoc[leveloffset=+1] -//Sample YAML for a machine set custom resource on IBM Cloud +//Sample YAML for a machine set custom resource on {ibm-cloud-title} include::modules/machineset-yaml-ibm-power-vs.adoc[leveloffset=+1] //Creating a machine set diff --git a/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc b/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc index aa5ed2224b..a3e04f7f83 100644 --- a/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc +++ b/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc +// * installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc ifeval::["{context}" == "configuring-iam-ibm-cloud"] :ibm-cloud: diff --git a/modules/cco-ccoctl-configuring.adoc b/modules/cco-ccoctl-configuring.adoc index 4cd7259267..ab6657e239 100644 --- a/modules/cco-ccoctl-configuring.adoc +++ b/modules/cco-ccoctl-configuring.adoc @@ -5,7 +5,7 @@ // * updating/preparing_for_updates/preparing-manual-creds-update.adoc // //Platforms that must use `ccoctl` and update content -// * installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc +// * installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc // * installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.doc // * installing/installing_nutanix/preparing-to-install-on-nutanix.adoc // @@ -391,7 +391,7 @@ Available Commands: azure Manage credentials objects for Azure gcp Manage credentials objects for Google cloud help Help about any command - ibmcloud Manage credentials objects for IBM Cloud + ibmcloud Manage credentials objects for {ibm-cloud-title} nutanix Manage credentials objects for Nutanix Flags: diff --git a/modules/cli-installing-cli.adoc b/modules/cli-installing-cli.adoc index 72eb760bdd..e6136c784e 100644 --- a/modules/cli-installing-cli.adoc +++ b/modules/cli-installing-cli.adoc @@ -27,11 +27,11 @@ // * installing/installing_gcp/installing-gcp-vpc.adoc // * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/install_config/installing-restricted-networks-preparations.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc // * openshift_images/samples-operator-alt-registry.adoc diff --git a/modules/cli-logging-in-kubeadmin.adoc b/modules/cli-logging-in-kubeadmin.adoc index 48dc8a5d72..4397fac23f 100644 --- a/modules/cli-logging-in-kubeadmin.adoc +++ b/modules/cli-logging-in-kubeadmin.adoc @@ -30,14 +30,14 @@ // * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc // * installing/installing_gcp/installing-restricted-networks-gcp.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer.adoc // * installing/installing_aws/installing-restricted-networks-aws.adoc diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index e64a1189d6..a26efdd167 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -11,11 +11,11 @@ // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_platform_agnostic/installing-platform-agnostic.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc // * installing/installing_ibm_z/installing-ibm-z-kvm.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc diff --git a/modules/cluster-telemetry.adoc b/modules/cluster-telemetry.adoc index 392f608078..ba088865e8 100644 --- a/modules/cluster-telemetry.adoc +++ b/modules/cluster-telemetry.adoc @@ -52,11 +52,11 @@ // * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc // * installing/installing_gcp/installing-gcp-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_ibm_power/installing-ibm-power.adoc // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc diff --git a/modules/install-ibm-cloud-configuring-the-install-config-file.adoc b/modules/install-ibm-cloud-classic-configuring-the-install-config-file.adoc similarity index 97% rename from modules/install-ibm-cloud-configuring-the-install-config-file.adoc rename to modules/install-ibm-cloud-classic-configuring-the-install-config-file.adoc index 827c26064f..2586422057 100644 --- a/modules/install-ibm-cloud-configuring-the-install-config-file.adoc +++ b/modules/install-ibm-cloud-classic-configuring-the-install-config-file.adoc @@ -1,6 +1,6 @@ // This is included in the following assemblies: // -// installing_ibm_cloud/install-ibm-cloud-installing-on-ibm-cloud.adoc +// installing_ibm_cloud_classic/install-ibm-cloud-installing-on-ibm-cloud.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-the-install-config-file_{context}"] diff --git a/modules/install-ibm-cloud-configuring-the-public-subnet.adoc b/modules/install-ibm-cloud-classic-configuring-the-public-subnet.adoc similarity index 98% rename from modules/install-ibm-cloud-configuring-the-public-subnet.adoc rename to modules/install-ibm-cloud-classic-configuring-the-public-subnet.adoc index 338cac2ad8..53b1f5f431 100644 --- a/modules/install-ibm-cloud-configuring-the-public-subnet.adoc +++ b/modules/install-ibm-cloud-classic-configuring-the-public-subnet.adoc @@ -1,6 +1,6 @@ // This is included in the following assemblies: // -// installing_ibm_cloud/install-ibm-cloud-installing-on-ibm-cloud.adoc +// installing_ibm_cloud_classic/install-ibm-cloud-installing-on-ibm-cloud.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-the-public-subnet_{context}"] diff --git a/modules/install-ibm-cloud-preparing-the-provisioner-node.adoc b/modules/install-ibm-cloud-classic-preparing-the-provisioner-node.adoc similarity index 98% rename from modules/install-ibm-cloud-preparing-the-provisioner-node.adoc rename to modules/install-ibm-cloud-classic-preparing-the-provisioner-node.adoc index 426077c339..5fbffb2f32 100644 --- a/modules/install-ibm-cloud-preparing-the-provisioner-node.adoc +++ b/modules/install-ibm-cloud-classic-preparing-the-provisioner-node.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud/install-ibm-cloud-installing-on-ibm-cloud.adoc +// * installing/installing_ibm_cloud_classic/install-ibm-cloud-installing-on-ibm-cloud.adoc :_mod-docs-content-type: PROCEDURE [id="preparing-the-provisioner-node-for-openshift-install-on-ibm-cloud_{context}"] diff --git a/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc b/modules/install-ibm-cloud-classic-setting-up-ibm-cloud-infrastructure.adoc similarity index 99% rename from modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc rename to modules/install-ibm-cloud-classic-setting-up-ibm-cloud-infrastructure.adoc index 3cb86f9c43..586212616c 100644 --- a/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc +++ b/modules/install-ibm-cloud-classic-setting-up-ibm-cloud-infrastructure.adoc @@ -1,6 +1,6 @@ // This is included in the following assemblies: // -// installing_ibm_cloud/install-ibm-cloud-installing-on-ibm-cloud.adoc +// installing_ibm_cloud_classic/install-ibm-cloud-installing-on-ibm-cloud.adoc :_mod-docs-content-type: PROCEDURE [id="setting-up-ibm-cloud-infrastructure_{context}"] = Setting up {ibm-cloud-bm-title} infrastructure diff --git a/modules/installation-about-restricted-network.adoc b/modules/installation-about-restricted-network.adoc index 9d2ab3ed2b..ebf1245c89 100644 --- a/modules/installation-about-restricted-network.adoc +++ b/modules/installation-about-restricted-network.adoc @@ -12,7 +12,7 @@ // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc // * installing/installing-restricted-networks-azure-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc ifeval::["{context}" == "installing-ibm-power"] :ibm-power: diff --git a/modules/installation-cis-ibm-cloud.adoc b/modules/installation-cis-ibm-cloud.adoc index 3dcad4d16c..32eb053684 100644 --- a/modules/installation-cis-ibm-cloud.adoc +++ b/modules/installation-cis-ibm-cloud.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc // installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc ifeval::["{context}" == "installing-ibm-cloud-account-power-vs"] diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index c326800662..6867ad4380 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -6,7 +6,7 @@ // * installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc // * installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc // * installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc -// * installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vps.adoc +// * installing/installing_ibm_cloud/installation-config-parameters-ibm-cloud-vps.adoc // * installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc // * installing/installing_nutanix/installation-config-parameters-nutanix.adoc // * installing/installing_openstack/installation-config-parameters-openstack.adoc diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index d18649e907..82e810c1c4 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -25,11 +25,11 @@ // * installing/installing_gcp/installing-gcp-user-infra-vpc.adoc // * installing/installing_gcp/installing-restricted-networks-gcp.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc diff --git a/modules/installation-custom-ibm-cloud-vpc.adoc b/modules/installation-custom-ibm-cloud-vpc.adoc index 0e5b6de2be..945b0a61eb 100644 --- a/modules/installation-custom-ibm-cloud-vpc.adoc +++ b/modules/installation-custom-ibm-cloud-vpc.adoc @@ -1,9 +1,9 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud_classic/installing-ibm-cloud-vpc.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc ifeval::["{context}" == "installing-ibm-cloud-vpc"] :ibm-cloud: diff --git a/modules/installation-dns-ibm-cloud.adoc b/modules/installation-dns-ibm-cloud.adoc index de522d80e7..9fe64f0e08 100644 --- a/modules/installation-dns-ibm-cloud.adoc +++ b/modules/installation-dns-ibm-cloud.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc :_mod-docs-content-type: PROCEDURE [id="installation-dns-ibm-cloud_{context}"] diff --git a/modules/installation-ibm-cloud-config-yaml.adoc b/modules/installation-ibm-cloud-config-yaml.adoc index 4e7d3eea79..3fbd47ed7b 100644 --- a/modules/installation-ibm-cloud-config-yaml.adoc +++ b/modules/installation-ibm-cloud-config-yaml.adoc @@ -1,10 +1,10 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc ifeval::["{context}" == "installing-ibm-cloud-network-customizations"] :with-networking: diff --git a/modules/installation-ibm-cloud-configure-vpc-for-endpoint-gateways.adoc b/modules/installation-ibm-cloud-configure-vpc-for-endpoint-gateways.adoc index c93290b835..6802f46349 100644 --- a/modules/installation-ibm-cloud-configure-vpc-for-endpoint-gateways.adoc +++ b/modules/installation-ibm-cloud-configure-vpc-for-endpoint-gateways.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc :_mod-docs-content-type: PROCEDURE [id="installation-ibm-cloud-configure-vpc-for-endpoint-gateways_{context}"] diff --git a/modules/installation-ibm-cloud-creating-api-key.adoc b/modules/installation-ibm-cloud-creating-api-key.adoc index 9c2d9106e6..ddfcad0bb8 100644 --- a/modules/installation-ibm-cloud-creating-api-key.adoc +++ b/modules/installation-ibm-cloud-creating-api-key.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc // installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/installation-ibm-cloud-download-rhcos.adoc b/modules/installation-ibm-cloud-download-rhcos.adoc index c4e7f4829e..b12f465790 100644 --- a/modules/installation-ibm-cloud-download-rhcos.adoc +++ b/modules/installation-ibm-cloud-download-rhcos.adoc @@ -1,5 +1,5 @@ // Module included in the following assemblies: -// * installing/installing_installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_installing_ibm_cloud/installing-ibm-cloud-restricted.adoc :_mod-docs-content-type: PROCEDURE [id="installation-ibm-cloud-download-rhcos_{context}"] diff --git a/modules/installation-ibm-cloud-export-variables.adoc b/modules/installation-ibm-cloud-export-variables.adoc index eaee5b2fd7..15d18e83b2 100644 --- a/modules/installation-ibm-cloud-export-variables.adoc +++ b/modules/installation-ibm-cloud-export-variables.adoc @@ -1,14 +1,14 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc ifeval::["{context}" == "installing-ibm-cloud-customizations"] :ibm-vpc: diff --git a/modules/installation-ibm-cloud-iam-policies-api-key.adoc b/modules/installation-ibm-cloud-iam-policies-api-key.adoc index 2d38a2e814..d7f7eb3d01 100644 --- a/modules/installation-ibm-cloud-iam-policies-api-key.adoc +++ b/modules/installation-ibm-cloud-iam-policies-api-key.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc // installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc ifeval::["{context}" == "installing-ibm-cloud-account"] diff --git a/modules/installation-ibm-cloud-regions.adoc b/modules/installation-ibm-cloud-regions.adoc index 48736d956a..a488d2c6e2 100644 --- a/modules/installation-ibm-cloud-regions.adoc +++ b/modules/installation-ibm-cloud-regions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc // installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc ifeval::["{context}" == "installing-ibm-cloud-account"] diff --git a/modules/installation-ibm-cloud-tested-machine-types.adoc b/modules/installation-ibm-cloud-tested-machine-types.adoc index f8114abed3..c0adbcbd38 100644 --- a/modules/installation-ibm-cloud-tested-machine-types.adoc +++ b/modules/installation-ibm-cloud-tested-machine-types.adoc @@ -1,10 +1,10 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc -// installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc [id="installation-ibm-cloud-tested-machine-types_{context}"] = Tested instance types for {ibm-cloud-title} diff --git a/modules/installation-initializing-manual.adoc b/modules/installation-initializing-manual.adoc index 69e7d84197..975b48b192 100644 --- a/modules/installation-initializing-manual.adoc +++ b/modules/installation-initializing-manual.adoc @@ -174,7 +174,7 @@ controlPlaneSubnets: computeSubnets: ---- + -For `platform.ibmcloud.vpcName`, specify the name for the existing IBM Cloud VPC. For `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`, specify the existing subnets to deploy the control plane machines and compute machines, respectively. +For `platform.ibmcloud.vpcName`, specify the name for the existing {ibm-cloud-title} Virtual Private Cloud (VPC) network. For `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`, specify the existing subnets to deploy the control plane machines and compute machines, respectively. .. Add the image content resources, which resemble the following YAML excerpt: + [source,yaml] diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc index cdeee197d6..8ecf936ae5 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -16,14 +16,14 @@ // * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_gcp/installing-restricted-networks-gcp.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-restricted.adoc // * installing/installing_openstack/installing-openstack-user.adoc @@ -527,7 +527,7 @@ controlPlaneSubnets: computeSubnets: ---- + -For `platform.ibmcloud.vpcName`, specify the name for the existing IBM Cloud VPC. For `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`, specify the existing subnets to deploy the control plane machines and compute machines, respectively. +For `platform.ibmcloud.vpcName`, specify the name for the existing {ibm-cloud-title} Virtual Private Cloud (VPC) network. For `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`, specify the existing subnets to deploy the control plane machines and compute machines, respectively. endif::ibm-cloud+restricted[] .. Add the image content resources, which resemble the following YAML excerpt: diff --git a/modules/installation-launching-installer.adoc b/modules/installation-launching-installer.adoc index b74127ce6d..0edf317312 100644 --- a/modules/installation-launching-installer.adoc +++ b/modules/installation-launching-installer.adoc @@ -24,11 +24,11 @@ // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc // * installing/installing_gcp/installing-ibm-cloud-customizations.adoc // * installing/installing_gcp/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-restricted.adoc // * installing/installing_openstack/installing-openstack-installer.adoc diff --git a/modules/installation-minimum-resource-requirements.adoc b/modules/installation-minimum-resource-requirements.adoc index e0d479ce01..67a2a66117 100644 --- a/modules/installation-minimum-resource-requirements.adoc +++ b/modules/installation-minimum-resource-requirements.adoc @@ -39,11 +39,11 @@ // * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc // * installing/installing_ibm_z/installing-ibm-z-lpar.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing-restricted-networks-azure-installer-provisioned.adoc // * installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc // * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc diff --git a/modules/installation-obtaining-installer.adoc b/modules/installation-obtaining-installer.adoc index 10989919f4..9e8f6c187f 100644 --- a/modules/installation-obtaining-installer.adoc +++ b/modules/installation-obtaining-installer.adoc @@ -23,10 +23,10 @@ // * installing/installing_gcp/installing-gcp-private.adoc // * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer.adoc // * installing/installing_platform_agnostic/installing-platform-agnostic.adoc @@ -79,7 +79,7 @@ a bastion host on your cloud network or a machine that has access to the to the For more information about private cluster installation requirements, see "Private clusters". endif::private[] endif::restricted[] -//mpytlak: Added "private" in the context of a review for the IBM Cloud private work. In an effort to keep updates to other platforms separate, I will open a doc story for each platform that supports a private install. +//mpytlak: Added "private" in the context of a review for the {ibm-cloud-title} private work. In an effort to keep updates to other platforms separate, I will open a doc story for each platform that supports a private install. .Prerequisites diff --git a/modules/installation-uninstall-clouds.adoc b/modules/installation-uninstall-clouds.adoc index f2f75dcbeb..f44b12d189 100644 --- a/modules/installation-uninstall-clouds.adoc +++ b/modules/installation-uninstall-clouds.adoc @@ -4,7 +4,7 @@ // * installing/installing_azure/uninstalling-cluster-azure.adoc // * installing/installing_azure/uninstalling-cluster-azure-stack-hub.adoc // * installing/installing_gcp/uninstalling-cluster-gcp.adoc -// * installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc +// * installing/installing_ibm_cloud/uninstalling-cluster-ibm-cloud.adoc // * installing/installing_ibm_powervs/uninstalling-cluster-ibm-power-vs.adoc // * installing/installing_osp/uninstalling-cluster-openstack.adoc // * installing/installing_vmc/uninstalling-cluster-vmc.adoc @@ -173,4 +173,4 @@ ifeval::["{context}" == "uninstalling-cluster-ibm-power-vs"] :!ibm-power-vs: endif::[] -// The above CCO credential removal for IBM Cloud is only necessary for manual mode. Future releases that support other credential methods will not require this step. +// The above CCO credential removal for {ibm-cloud-title} is only necessary for manual mode. Future releases that support other credential methods will not require this step. diff --git a/modules/manually-create-iam-ibm-cloud.adoc b/modules/manually-create-iam-ibm-cloud.adoc index 44c4a4f722..5ab679ef96 100644 --- a/modules/manually-create-iam-ibm-cloud.adoc +++ b/modules/manually-create-iam-ibm-cloud.adoc @@ -1,14 +1,14 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc ifeval::["{context}" == "installing-ibm-cloud-customizations"] :ibm-vpc: diff --git a/modules/nw-modifying-operator-install-config.adoc b/modules/nw-modifying-operator-install-config.adoc index f7bb87f563..0482dc863f 100644 --- a/modules/nw-modifying-operator-install-config.adoc +++ b/modules/nw-modifying-operator-install-config.adoc @@ -3,7 +3,7 @@ // * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc diff --git a/modules/nw-network-config.adoc b/modules/nw-network-config.adoc index 9923d1e59e..7a5df2c908 100644 --- a/modules/nw-network-config.adoc +++ b/modules/nw-network-config.adoc @@ -7,7 +7,7 @@ // * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_gcp/installing-gcp-network-customizations.adoc diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index f2f43d6c87..bc98bd6f6c 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -17,7 +17,7 @@ // * networking/cluster-network-operator.adoc // * networking/network_security/logging-network-security.adoc // * post_installation_configuration/network-configuration.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_ibm_power/installing-ibm-power.adoc // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc diff --git a/modules/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 1ce2fcc41f..569c448369 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -5,7 +5,7 @@ // * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc // * installing/installing_gcp/installing-restricted-networks-gcp.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc diff --git a/modules/private-clusters-about-ibm-cloud.adoc b/modules/private-clusters-about-ibm-cloud.adoc index e36e5b2e86..15ba4d9f83 100644 --- a/modules/private-clusters-about-ibm-cloud.adoc +++ b/modules/private-clusters-about-ibm-cloud.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc :_mod-docs-content-type: CONCEPT [id="private-clusters-about-ibm-cloud_{context}"] diff --git a/modules/private-clusters-about-ibm-power-vs.adoc b/modules/private-clusters-about-ibm-power-vs.adoc index 1f3c6fef43..950859c71e 100644 --- a/modules/private-clusters-about-ibm-power-vs.adoc +++ b/modules/private-clusters-about-ibm-power-vs.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc :_mod-docs-content-type: CONCEPT [id="private-clusters-about-ibm-power-virtual-server_{context}"] diff --git a/modules/private-clusters-default.adoc b/modules/private-clusters-default.adoc index 0d88e47680..29114b9f13 100644 --- a/modules/private-clusters-default.adoc +++ b/modules/private-clusters-default.adoc @@ -7,7 +7,7 @@ // * installing/installing_gcp/installing-gcp-private.adoc // * installing/installing_azure/installing-azure-government-region.adoc // * installing/installing_azure/installing-azure-private.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc [id="private-clusters-default_{context}"] = Private clusters diff --git a/modules/quotas-and-limits-ibm-cloud.adoc b/modules/quotas-and-limits-ibm-cloud.adoc index da06b2c732..3cb0f24659 100644 --- a/modules/quotas-and-limits-ibm-cloud.adoc +++ b/modules/quotas-and-limits-ibm-cloud.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +// installing/installing_ibm_cloud/installing-ibm-cloud-account.adoc :_mod-docs-content-type: CONCEPT [id="quotas-and-limits-ibm-cloud_{context}"] diff --git a/modules/ssh-agent-using.adoc b/modules/ssh-agent-using.adoc index 02ef0676da..84e9ade02b 100644 --- a/modules/ssh-agent-using.adoc +++ b/modules/ssh-agent-using.adoc @@ -26,15 +26,15 @@ // * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc // * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc // * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc -// * installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc +// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer.adoc // * installing/installing_aws/installing-restricted-networks-aws.adoc diff --git a/modules/storage-persistent-storage-block-volume.adoc b/modules/storage-persistent-storage-block-volume.adoc index 29e59821cd..bbb5927d93 100644 --- a/modules/storage-persistent-storage-block-volume.adoc +++ b/modules/storage-persistent-storage-block-volume.adoc @@ -40,7 +40,7 @@ ifndef::openshift-rosa[] endif::openshift-rosa[] ifndef::openshift-dedicated,openshift-rosa[] |HostPath | | | -|IBM VPC Disk | ✅ | ✅ | ✅ +|IBM Cloud Block Storage volume | ✅ | ✅ | ✅ |iSCSI | ✅ | | ✅ |Local volume | ✅ || ✅ endif::openshift-dedicated,openshift-rosa[] diff --git a/modules/storage-persistent-storage-pv.adoc b/modules/storage-persistent-storage-pv.adoc index 9e8426fd92..dc3cca4a8d 100644 --- a/modules/storage-persistent-storage-pv.adoc +++ b/modules/storage-persistent-storage-pv.adoc @@ -137,7 +137,7 @@ ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] endif::[] |=== -- -1. RWOP uses the SELinux mount feature. This feature is driver dependent, and enabled by default in ODF, AWS EBS, Azure Disk, GCP PD, IBM VPC Block, Cinder, and vSphere. For third-party drivers, please contact your storage vendor. +1. RWOP uses the SELinux mount feature. This feature is driver dependent, and enabled by default in ODF, AWS EBS, Azure Disk, GCP PD, IBM Cloud Block Storage volume, Cinder, and vSphere. For third-party drivers, please contact your storage vendor. -- endif::microshift[] diff --git a/post_installation_configuration/changing-cloud-credentials-configuration.adoc b/post_installation_configuration/changing-cloud-credentials-configuration.adoc index 22b546909d..7211dd01db 100644 --- a/post_installation_configuration/changing-cloud-credentials-configuration.adoc +++ b/post_installation_configuration/changing-cloud-credentials-configuration.adoc @@ -23,7 +23,7 @@ To allow the cluster to use the new credentials, you must update the secrets tha // Right now only IBM can do this, but it makes sense to set this up so that other clouds can be added. The Cloud Credential Operator (CCO) utility `ccoctl` supports updating secrets for clusters installed on {ibm-cloud-name}. -//Rotating IBM Cloud credentials with ccoctl +//Rotating {ibm-cloud-title} credentials with ccoctl include::modules/refreshing-service-ids-ibm-cloud.adoc[leveloffset=+3] //Rotating cloud provider credentials manually diff --git a/rest_api/operator_apis/clustercsidriver-operator-openshift-io-v1.adoc b/rest_api/operator_apis/clustercsidriver-operator-openshift-io-v1.adoc index 119a83d83e..9b5f7e2367 100644 --- a/rest_api/operator_apis/clustercsidriver-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/clustercsidriver-operator-openshift-io-v1.adoc @@ -134,7 +134,7 @@ Required:: | `ibmcloud` | `object` -| ibmcloud is used to configure the IBM Cloud CSI driver. +| ibmcloud is used to configure the {ibm-cloud-title} CSI driver. | `vSphere` | `object` @@ -341,7 +341,7 @@ Required:: Description:: + -- -ibmcloud is used to configure the IBM Cloud CSI driver. +ibmcloud is used to configure the {ibm-cloud-title} CSI driver. -- Type:: @@ -358,7 +358,7 @@ Required:: | `encryptionKeyCRN` | `string` -| encryptionKeyCRN is the IBM Cloud CRN of the customer-managed root key to use for disk encryption of volumes for the default storage classes. +| encryptionKeyCRN is the {ibm-cloud-title} CRN of the customer-managed root key to use for disk encryption of volumes for the default storage classes. |=== === .spec.driverConfig.vSphere diff --git a/rosa_architecture/index.adoc b/rosa_architecture/index.adoc index 4c0eb5773d..25c8ac1aa8 100644 --- a/rosa_architecture/index.adoc +++ b/rosa_architecture/index.adoc @@ -90,7 +90,7 @@ Explore the following {product-title} installation tasks: - **xref:../installing/installing_gcp/preparing-to-install-on-gcp.adoc#preparing-to-install-on-gcp[Install a cluster on {gcp-short}]**: On {gcp-first} you can install {product-title} on installer-provisioned infrastructure or user-provisioned infrastructure. ifndef::openshift-origin[] -- **xref:../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[Install a cluster on {ibm-cloud-name}]**: On {ibm-cloud-name}, you can install {product-title} on installer-provisioned infrastructure. +- **xref:../installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[Install a cluster on {ibm-cloud-name}]**: On {ibm-cloud-name}, you can install {product-title} on installer-provisioned infrastructure. - **xref:../installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.adoc#preparing-to-install-on-ibm-power-vs[Install a cluster on {ibm-power-name} Virtual Server]**: On {ibm-power-name} Virtual Server, you can install {product-title} on installer-provisioned infrastructure. @@ -114,7 +114,7 @@ ifndef::openshift-origin[] user-provisioned infrastructure on xref:../installing/installing_aws/upi/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[{aws-first}], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[{gcp-short}], -xref:../installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[{vmw-short}], xref:../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}], xref:../installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc#preparing-to-install-on-ibm-z[{ibm-z-name} and {ibm-linuxone-name}], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibm-power-name}], +xref:../installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[{vmw-short}], xref:../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}], xref:../installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc#preparing-to-install-on-ibm-z[{ibm-z-name} and {ibm-linuxone-name}], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibm-power-name}], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal] and the cluster does not have full access to the internet, you must mirror the {product-title} installation images. To do this action, use one of the following methods, so that you can install a cluster in a restricted network. @@ -144,7 +144,7 @@ internet access, you can install a private cluster on xref:../installing/installing_aws/ipi/installing-aws-private.adoc#installing-aws-private[{aws-first}], xref:../installing/installing_azure/ipi/installing-azure-private.adoc#installing-azure-private[{azure-full}], xref:../installing/installing_gcp/installing-gcp-private.adoc#installing-gcp-private[{gcp-short}], or -xref:../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[{ibm-cloud-name}]. Internet access is still required to access the cloud APIs and installation media. +xref:../installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[{ibm-cloud-name}]. Internet access is still required to access the cloud APIs and installation media. - **xref:../installing/installing_bare_metal/installing-bare-metal.adoc#rhcos-install-iscsi-manual_installing-bare-metal[Installing RHCOS manually on an iSCSI boot device] and xref:../installing/installing_bare_metal/installing-bare-metal.adoc#rhcos-install-iscsi-ibft_installing-bare-metal[Installing RHCOS on an iSCSI boot device using iBFT]**: You can target iSCSI devices as the root disk for installation of {op-system}. Multipathing is also supported. diff --git a/storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc b/storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc index b277771f0f..1a73da5a2b 100644 --- a/storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc +++ b/storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc @@ -22,7 +22,7 @@ include::modules/persistent-storage-csi-about.adoc[leveloffset=+1] ifndef::openshift-rosa,openshift-dedicated[] include::modules/persistent-storage-byok.adoc[leveloffset=+1] -For information about installing with user-managed encryption for IBM VPC, see xref:../../installing/installing_ibm_cloud_public/user-managed-encryption-ibm-cloud.adoc[User-managed encryption for IBM Cloud] and xref:../../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc[Preparing to install on IBM Cloud]. +For information about installing with user-managed encryption for {ibm-cloud-title}, see xref:../../installing/installing_ibm_cloud/user-managed-encryption-ibm-cloud.adoc#user-managed-encryption-ibm-cloud[User-managed encryption for {ibm-cloud-title}] and xref:../../installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc#prerequisites_preparing-to-install-on-ibm-cloud[Preparing to install on {ibm-cloud-title}]. endif::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc index 70c5d5a808..256d9d795a 100644 --- a/welcome/learn_more_about_openshift.adoc +++ b/welcome/learn_more_about_openshift.adoc @@ -82,7 +82,7 @@ a| If your cluster uses user-provisioned infrastructure, and the cluster does no * xref:../installing/installing_aws/upi/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[{aws-first}] * xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[{gcp-short}] * xref:../installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[{vmw-short}] -* xref:../installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}] +* xref:../installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc#installing-ibm-cloud-restricted[{ibm-cloud-name}] * xref:../installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc#preparing-to-install-on-ibm-z[{ibm-z-name} and {ibm-linuxone-name}] * xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibm-power-name}] * xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal]