diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index c9e1f63b1d..2f70120124 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -209,19 +209,25 @@ endif::[] :gcp-short: GCP //alibaba cloud :alibaba: Alibaba Cloud -// IBM Cloud VPC -:ibmcloudVPCProductName: IBM Cloud VPC -:ibmcloudVPCRegProductName: IBM(R) Cloud VPC +// IBM general +:ibm-name: IBM(R) +:ibm-title: IBM // IBM Cloud -:ibm-cloud-bm: IBM Cloud Bare Metal (Classic) -:ibm-cloud-bm-reg: IBM Cloud(R) Bare Metal (Classic) +:ibm-cloud-name: IBM Cloud(R) +:ibm-cloud-title: IBM Cloud +// IBM Cloud Bare Metal (Classic) +:ibm-cloud-bm: IBM Cloud(R) Bare Metal (Classic) +:ibm-cloud-bm-title: IBM Cloud Bare Metal (Classic) // IBM Power -:ibmpowerProductName: IBM Power -:ibmpowerRegProductName: IBM(R) Power +:ibm-power-name: IBM Power(R) +:ibm-power-title: IBM Power +:ibm-power-server-name: IBM Power(R) Virtual Server +:ibm-power-server-title: IBM Power Virtual Server // IBM zSystems -:ibmzProductName: IBM Z -:ibmzRegProductName: IBM(R) Z -:linuxoneProductName: IBM(R) LinuxONE +:ibm-z-name: IBM Z(R) +:ibm-z-title: IBM Z +:ibm-linuxone-name: IBM(R) LinuxONE +:ibm-linuxone-title: IBM LinuxONE //Azure :azure-full: Microsoft Azure :azure-short: Azure diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 08e628a7cf..e443247c09 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -277,27 +277,27 @@ Topics: File: installation-config-parameters-gcp - Name: Uninstalling a cluster on GCP File: uninstalling-cluster-gcp -- Name: Installing on IBM Cloud VPC +- Name: Installing on IBM Cloud Dir: installing_ibm_cloud_public Distros: openshift-origin,openshift-enterprise Topics: - - Name: Preparing to install on IBM Cloud VPC + - Name: Preparing to install on IBM Cloud File: preparing-to-install-on-ibm-cloud - Name: Configuring an IBM Cloud account File: installing-ibm-cloud-account - - Name: Configuring IAM for IBM Cloud VPC + - Name: Configuring IAM for IBM Cloud File: configuring-iam-ibm-cloud - - Name: Installing a cluster on IBM Cloud VPC with customizations + - Name: Installing a cluster on IBM Cloud with customizations File: installing-ibm-cloud-customizations - - Name: Installing a cluster on IBM Cloud VPC with network customizations + - Name: Installing a cluster on IBM Cloud with network customizations File: installing-ibm-cloud-network-customizations - - Name: Installing a cluster on IBM Cloud VPC into an existing VPC + - Name: Installing a cluster on IBM Cloud into an existing VPC File: installing-ibm-cloud-vpc - - Name: Installing a private cluster on IBM Cloud VPC + - Name: Installing a private cluster on IBM Cloud File: installing-ibm-cloud-private - - Name: Installation configuration parameters for IBM Cloud VPC + - Name: Installation configuration parameters for IBM Cloud File: installation-config-parameters-ibm-cloud-vpc - - Name: Uninstalling a cluster on IBM Cloud VPC + - Name: Uninstalling a cluster on IBM Cloud File: uninstalling-cluster-ibm-cloud - Name: Installing on Nutanix Dir: installing_nutanix diff --git a/applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc b/applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc index e96d715fcb..bd200f551a 100644 --- a/applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc +++ b/applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="getting-started-with-service-binding-ibm-power-ibm-z"] -= Getting started with service binding on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName} += Getting started with service binding on {ibm-power-title}, {ibm-z-title}, and {ibm-linuxone-title} include::_attributes/common-attributes.adoc[] include::_attributes/servicebinding-document-attributes.adoc[] :context: getting-started-with-service-binding-ibm-power-ibm-z diff --git a/applications/index.adoc b/applications/index.adoc index ab490b3f8d..ac102b5f6e 100644 --- a/applications/index.adoc +++ b/applications/index.adoc @@ -36,7 +36,7 @@ When the application is running, not all applications resources are used. As a c [id="connecting-application"] === Connecting an application to services -An application uses backing services to build and connect workloads, which vary according to the service provider. Using the xref:../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#understanding-service-binding-operator[Service Binding Operator], as a developer, you can bind workloads together with Operator-managed backing services, without any manual procedures to configure the binding connection. You can apply service binding also on xref:../applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc#getting-started-with-service-binding-ibm-power-ibm-z[{ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName} environments]. +An application uses backing services to build and connect workloads, which vary according to the service provider. Using the xref:../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#understanding-service-binding-operator[Service Binding Operator], as a developer, you can bind workloads together with Operator-managed backing services, without any manual procedures to configure the binding connection. You can apply service binding also on xref:../applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc#getting-started-with-service-binding-ibm-power-ibm-z[{ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name} environments]. [id="deploying-application"] === Deploying an application diff --git a/applications/working_with_helm_charts/installing-helm.adoc b/applications/working_with_helm_charts/installing-helm.adoc index 5ab49734c2..10a0bcd714 100644 --- a/applications/working_with_helm_charts/installing-helm.adoc +++ b/applications/working_with_helm_charts/installing-helm.adoc @@ -24,14 +24,14 @@ You can also find the URL to the latest binaries from the {product-title} web co # curl -L https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-amd64 -o /usr/local/bin/helm ---- -* Linux on {ibmzProductName} and {linuxoneProductName} (s390x) +* Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x) + [source,terminal] ---- # curl -L https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-s390x -o /usr/local/bin/helm ---- -* Linux on {ibmpowerProductName} (ppc64le) +* Linux on {ibm-power-name} (ppc64le) + [source,terminal] ---- diff --git a/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc b/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc index dfd753550b..f2ab1c4f13 100644 --- a/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc +++ b/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc @@ -58,7 +58,7 @@ By setting different values for the `credentialsMode` parameter in the `install- |X |X -|IBM Cloud +|{ibm-cloud-name} | | |X ^[1]^ diff --git a/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc b/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc index 2018b0e0f7..20e42f1236 100644 --- a/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc +++ b/authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc @@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[] toc::[] -Manual mode is supported for Alibaba Cloud, Amazon Web Services (AWS), global Microsoft Azure, Microsoft Azure Stack Hub, Google Cloud Platform (GCP), IBM Cloud, and Nutanix. +Manual mode is supported for Alibaba Cloud, Amazon Web Services (AWS), global Microsoft Azure, Microsoft Azure Stack Hub, Google Cloud Platform (GCP), {ibm-cloud-name}, and Nutanix. [id="manual-mode-classic_{context}"] == User-managed credentials @@ -30,7 +30,7 @@ An AWS, global Azure, or GCP cluster that uses manual mode might be configured t * xref:../../installing/installing_aws/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS] * xref:../../installing/installing_azure/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] +* xref:../../installing/installing_ibm_cloud_public/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/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc b/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc index 85c968bb84..f04b19f54a 100644 --- a/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc +++ b/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc @@ -16,11 +16,11 @@ include::modules/oadp-configuring-velero-plugins.adoc[leveloffset=+1] include::modules/oadp-supported-architecture.adoc[leveloffset=+1] [id="oadp-support-for-ibm-power-and-ibm-z"] -== OADP support for IBM Power and {ibmzProductName} +== OADP support for {ibm-power-title} and {ibm-z-title} -OpenShift API for Data Protection (OADP) is platform neutral. The information that follows relates only to IBM Power and to {ibmzProductName}. +OpenShift API for Data Protection (OADP) is platform neutral. The information that follows relates only to {ibm-power-name} and to {ibm-z-name}. -OADP 1.1.0 was tested successfully against {product-title} 4.11 for both IBM Power and {ibmzProductName}. The sections that follow give testing and support information for OADP 1.1.0 in terms of backup locations for these systems. +OADP 1.1.0 was tested successfully against {product-title} 4.11 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for OADP 1.1.0 in terms of backup locations for these systems. include::modules/oadp-ibm-power-test-support.adoc[leveloffset=+2] include::modules/oadp-ibm-z-test-support.adoc[leveloffset=+2] diff --git a/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc b/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc index f369d30dba..704019cdd9 100644 --- a/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc +++ b/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc @@ -45,7 +45,7 @@ In-memory storage is not persistent, which means that if the {JaegerShortName} i * The streaming strategy requires an additional Red Hat subscription for AMQ Streams. -* The streaming deployment strategy is currently unsupported on {ibmzProductName}. +* The streaming deployment strategy is currently unsupported on {ibm-z-name}. ==== diff --git a/hosted_control_planes/hcp-configuring.adoc b/hosted_control_planes/hcp-configuring.adoc index 802f54e86a..216568ff36 100644 --- a/hosted_control_planes/hcp-configuring.adoc +++ b/hosted_control_planes/hcp-configuring.adoc @@ -44,8 +44,8 @@ You can view the procedures by selecting from one of the following providers: // To be added after ACM 2.9 goes live: -//{ibmpowerProductName} -//{ibmzProductName} +// IBM Power +// IBM Z diff --git a/installing/installing-fips.adoc b/installing/installing-fips.adoc index e2b875eab0..fcce719d93 100644 --- a/installing/installing-fips.adoc +++ b/installing/installing-fips.adoc @@ -89,10 +89,10 @@ To enable FIPS mode for your cluster, you must run the installation program from * xref:../installing/installing_azure/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 VPC] -* xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[{ibmpowerProductName}] -* xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibmzProductName} and {linuxoneProductName}] -* xref:../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibmzProductName} and {linuxoneProductName} with {op-system-base} KVM] +* xref:../installing/installing_ibm_cloud_public/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] * xref:../installing/installing_openstack/installing-openstack-installer-custom.adoc#installing-openstack-installer-custom[{rh-openstack-first}] * xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[VMware vSphere] diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc index 9ee7d5a8e7..174467bdbe 100644 --- a/installing/installing-preparing.adoc +++ b/installing/installing-preparing.adoc @@ -28,11 +28,11 @@ endif::openshift-origin[] * Google Cloud Platform (GCP) on 64-bit x86 instances * Google Cloud Platform (GCP) on 64-bit ARM instances * {rh-openstack-first} -* IBM Cloud VPC -* {ibmzProductName} or {linuxoneProductName} -* {ibmzProductName} or {linuxoneProductName} for {op-system-base-full} KVM -* {ibmpowerProductName} -* {ibmpowerProductName} Virtual Server +* {ibm-cloud-name} +* {ibm-z-name} or {ibm-linuxone-name} +* {ibm-z-name} or {ibm-linuxone-name} for {op-system-base-full} KVM +* {ibm-power-name} +* {ibm-power-server-name} * Nutanix * VMware vSphere * Bare metal or other platform agnostic infrastructure @@ -40,7 +40,7 @@ endif::openshift-origin[] You can deploy an {product-title} 4 cluster to both on-premise hardware and to cloud hosting services, but all of the machines in a cluster must be in the same data center or cloud hosting service. -If you want to use {product-title} but do not want to manage the cluster yourself, you have several managed service options. If you want a cluster that is fully managed by Red Hat, you can use link:https://www.openshift.com/products/dedicated/[OpenShift Dedicated] or link:https://www.openshift.com/products/online/[OpenShift Online]. You can also use OpenShift as a managed service on Azure, AWS, IBM Cloud VPC, or Google Cloud. For more information about managed services, see the link:https://www.openshift.com/products[OpenShift Products] page. If you install an {product-title} cluster with a cloud virtual machine as a virtual bare metal, the corresponding cloud-based storage is not supported. +If you want to use {product-title} but do not want to manage the cluster yourself, you have several managed service options. If you want a cluster that is fully managed by Red Hat, you can use link:https://www.openshift.com/products/dedicated/[OpenShift Dedicated] or link:https://www.openshift.com/products/online/[OpenShift Online]. You can also use OpenShift as a managed service on Azure, AWS, {ibm-cloud-name}, or Google Cloud. For more information about managed services, see the link:https://www.openshift.com/products[OpenShift Products] page. If you install an {product-title} cluster with a cloud virtual machine as a virtual bare metal, the corresponding cloud-based storage is not supported. [id="installing-preparing-migrate"] === Have you used {product-title} 3 and want to use {product-title} 4? @@ -67,7 +67,7 @@ You can use the installer-provisioned infrastructure method to create appropriat If you want to reuse extensive cloud infrastructure, you can complete a _user-provisioned infrastructure_ installation. With these installations, you manually deploy the machines that your cluster requires during the installation process. If you perform a user-provisioned infrastructure installation on xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS], xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[Azure], xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Azure Stack Hub], you can use the provided templates to help you stand up all of the required components. You can also reuse a shared xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[VPC on GCP]. Otherwise, you can use the xref:../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#installing-platform-agnostic[provider-agnostic] installation method to deploy a cluster into other clouds. -You can also complete a user-provisioned infrastructure installation on your existing hardware. If you use xref:../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[{rh-openstack}], xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibmzProductName} or {linuxoneProductName}], xref:../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibmzProductName} and {linuxoneProductName} with {op-system-base} KVM], xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[IBM Power], or xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[vSphere], use the specific installation instructions to deploy your cluster. If you use other supported hardware, follow the xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal installation] procedure. For some of these platforms, such as xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[{rh-openstack}], xref:../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[vSphere], and xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[bare metal], you can also customize additional network parameters during installation. +You can also complete a user-provisioned infrastructure installation on your existing hardware. If you use xref:../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[{rh-openstack}], xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} or {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], xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[], or xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[vSphere], use the specific installation instructions to deploy your cluster. If you use other supported hardware, follow the xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal installation] procedure. For some of these platforms, such as xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[{rh-openstack}], xref:../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[vSphere], and xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[bare metal], you can also customize additional network parameters during installation. [id="installing-preparing-security"] @@ -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/installing-aws-private.adoc#installing-aws-private[AWS], xref:../installing/installing_azure/installing-azure-private.adoc#installing-azure-private[Azure], or xref:../installing/installing_gcp/installing-gcp-private.adoc#installing-gcp-private[GCP]. -If you need to install your cluster that has limited access to the internet, such as a disconnected or restricted network cluster, you can xref:../installing/disconnected_install/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[mirror the installation packages] and install the cluster from them. Follow detailed instructions for user provisioned infrastructure installations into restricted networks for xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[GCP], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{ibmzProductName} or {linuxoneProductName}], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibmzProductName} or {linuxoneProductName} with {op-system-base} KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[IBM Power], xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal]. You can also install a cluster into a restricted network using installer-provisioned infrastructure by following detailed instructions for xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[GCP], xref:../installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc#installing-restricted-networks-nutanix-installer-provisioned[Nutanix], xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[{rh-openstack}], and xref:../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[vSphere]. +If you need to install your cluster that has limited access to the internet, such as a disconnected or restricted network cluster, you can xref:../installing/disconnected_install/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[mirror the installation packages] and install the cluster from them. Follow detailed instructions for user provisioned infrastructure installations into restricted networks for xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[GCP], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{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[], xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal]. You can also install a cluster into a restricted network using installer-provisioned infrastructure by following detailed instructions for xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[GCP], xref:../installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc#installing-restricted-networks-nutanix-installer-provisioned[Nutanix], xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[{rh-openstack}], and xref:../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[vSphere]. If you need to deploy your cluster to an xref:../installing/installing_aws/installing-aws-government-region.adoc#installing-aws-government-region[AWS GovCloud region], xref:../installing/installing_aws/installing-aws-china.adoc#installing-aws-china-region[AWS China region], or xref:../installing/installing_azure/installing-azure-government-region.adoc#installing-azure-government-region[Azure government region], you can configure those custom regions during an installer-provisioned infrastructure installation. @@ -131,7 +131,7 @@ Not all installation options are supported for all platforms, as shown in the fo //This table is for all flavors of OpenShift, except OKD. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors. ifndef::openshift-origin[] |=== -||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM)|Azure Stack Hub |GCP (64-bit x86) |GCP (64-bit ARM) |Nutanix |{rh-openstack} |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} |{ibmpowerProductName} Virtual Server +||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM)|Azure Stack Hub |GCP (64-bit x86) |GCP (64-bit ARM) |Nutanix |{rh-openstack} |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |{ibm-cloud-name} |{ibm-z-name} |{ibm-power-name} |{ibm-power-server-name} |Default |xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[✓] @@ -310,7 +310,7 @@ endif::openshift-origin[] //This table is for OKD only. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors. ifdef::openshift-origin[] |=== -||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |Bare metal |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} +||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |Bare metal |vSphere |VMC |{ibm-cloud-name} |{ibm-z-name} |{ibm-power-name} |Default @@ -450,7 +450,7 @@ endif::openshift-origin[] //This table is for all flavors of OpenShift, except OKD. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors. ifndef::openshift-origin[] |=== -||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM) |Azure Stack Hub |GCP (64-bit x86) |GCP (64-bit ARM) |Nutanix |{rh-openstack} |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |IBM Cloud VPC |{ibmzProductName} |{ibmzProductName} with {op-system-base} KVM |{ibmpowerProductName} |Platform agnostic +||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM) |Azure Stack Hub |GCP (64-bit x86) |GCP (64-bit ARM) |Nutanix |{rh-openstack} |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |{ibm-cloud-name} |{ibm-z-name} |{ibm-z-name} with {op-system-base} KVM |{ibm-power-name} |Platform agnostic |Custom @@ -540,7 +540,7 @@ endif::openshift-origin[] //This table is for OKD only. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors. ifdef::openshift-origin[] |=== -||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack}|Bare metal |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmzProductName} with {op-system-base} KVM |{ibmpowerProductName} |Platform agnostic +||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack}|Bare metal |vSphere |VMC |{ibm-cloud-name} |{ibm-z-name} |{ibm-z-name} with {op-system-base} KVM |{ibm-power-name} |Platform agnostic |Custom diff --git a/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc b/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc index 43553542eb..f798066e41 100644 --- a/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc +++ b/installing/installing_ibm_cloud/install-ibm-cloud-prerequisites.adoc @@ -6,11 +6,11 @@ include::_attributes/common-attributes.adoc[] toc::[] -You can use installer-provisioned installation to install {product-title} on {ibm-cloud-bm-reg} nodes. This document describes the prerequisites and procedures when installing {product-title} on IBM Cloud nodes. +You can use installer-provisioned installation to install {product-title} on {ibm-cloud-bm} nodes. This document describes the prerequisites and procedures when installing {product-title} on {ibm-cloud-name} nodes. [IMPORTANT] ==== -Red Hat supports IPMI and PXE on the provisioning network only. Red Hat has not tested Red Fish, virtual media, or other complementary technologies such as Secure Boot on IBM Cloud deployments. A provisioning network is required. +Red Hat supports IPMI and PXE on the provisioning network only. Red Hat has not tested Red Fish, virtual media, or other complementary technologies such as Secure Boot on {ibm-cloud-name} deployments. A provisioning network is required. ==== Installer-provisioned installation of {product-title} requires: diff --git a/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc b/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc index fb7ab68d4d..2ca65d4168 100644 --- a/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc +++ b/installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="configuring-iam-ibm-cloud"] -= Configuring IAM for IBM Cloud VPC += Configuring IAM for {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: configuring-iam-ibm-cloud @@ -20,11 +20,11 @@ include::modules/cco-ccoctl-configuring.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_configuring-iam-ibm-cloud-refreshing-ids"] .Additional resources -* xref:../../post_installation_configuration/cluster-tasks.adoc#refreshing-service-ids-ibm-cloud_post-install-cluster-tasks[Rotating API keys for IBM Cloud VPC] +* xref:../../post_installation_configuration/cluster-tasks.adoc#refreshing-service-ids-ibm-cloud_post-install-cluster-tasks[Rotating API keys for {ibm-cloud-name}] [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 VPC with customizations] +* xref:../../installing/installing_ibm_cloud_public/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_public/installation-config-parameters-ibm-cloud-vpc.adoc b/installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc index a5c0cde68e..ac86eda84e 100644 --- a/installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc +++ b/installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="installation-config-parameters-ibm-cloud-vpc"] -= Installation configuration parameters for IBM Cloud VPC += Installation configuration parameters for {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: installation-config-parameters-ibm-cloud-vpc -:platform: IBM Cloud VPC +:platform: {ibm-cloud-title} toc::[] -Before you deploy an {product-title} cluster on IBM Cloud VPC, you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further. +Before you deploy an {product-title} cluster on {ibm-cloud-name}, you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further. include::modules/installation-configuration-parameters.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc b/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc index 9b87419e50..b1aed4489e 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc +++ b/installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc @@ -1,17 +1,17 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-account"] -= Configuring an IBM Cloud account += Configuring an {ibm-cloud-title} account include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-account toc::[] -Before you can install {product-title}, you must configure an IBM Cloud account. +Before you can install {product-title}, you must configure an {ibm-cloud-name} account. [id="prerequisites_installing-ibm-cloud-account"] == Prerequisites -* You have an IBM Cloud account with a subscription. You cannot install {product-title} on a free or trial IBM Cloud account. +* You have an {ibm-cloud-name} account with a subscription. You cannot install {product-title} on a free or trial {ibm-cloud-name} account. include::modules/quotas-and-limits-ibm-cloud.adoc[leveloffset=+1] @@ -20,8 +20,8 @@ include::modules/quotas-and-limits-ibm-cloud.adoc[leveloffset=+1] How you configure DNS resolution depends on the type of {product-title} cluster you are installing: -* If you are installing a public cluster, you use IBM Cloud Internet Services (CIS). -* If you are installing a private cluster, you use IBM Cloud DNS Services (DNS Services) +* If you are installing a public cluster, you use {ibm-cloud-title} Internet Services (CIS). +* If you are installing a private cluster, you use {ibm-cloud-name} DNS Services (DNS Services) include::modules/installation-cis-ibm-cloud.adoc[leveloffset=+2] include::modules/installation-dns-ibm-cloud.adoc[leveloffset=+2] @@ -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 VPC] +* xref:../../installing/installing_ibm_cloud_public/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_public/installing-ibm-cloud-customizations.adoc index 6bbf14ef66..82d95a8c39 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc +++ b/installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc @@ -1,21 +1,21 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-customizations"] -= Installing a cluster on IBM Cloud VPC with customizations += Installing a cluster on {ibm-cloud-title} with customizations include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-customizations toc::[] -In {product-title} version {product-version}, you can install a customized cluster on infrastructure that the installation program provisions on IBM Cloud VPC. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a customized cluster on infrastructure that the installation program provisions on {ibm-cloud-name}. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. [id="prerequisites_installing-ibm-cloud-customizations"] == 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/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 account] to host the cluster. +* 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. * 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_public/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 VPC] +* 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}] 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_public/installing-ibm-cloud-network-customizations.adoc index bab395456b..f85869ff26 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc +++ b/installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc @@ -1,13 +1,13 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-network-customizations"] -= Installing a cluster on IBM Cloud VPC with network customizations += Installing a cluster on {ibm-cloud-title} with network customizations include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-network-customizations toc::[] In {product-title} version {product-version}, you can install a cluster with a -customized network configuration on infrastructure that the installation program provisions on IBM Cloud VPC. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +customized network configuration on infrastructure that the installation program provisions on {ibm-cloud-name}. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. You must set most of the network configuration parameters during installation, and you can modify only `kubeProxy` configuration parameters in a running cluster. @@ -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/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 account] to host the cluster. +* 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. * 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_public/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 VPC] +* 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}] 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_public/installing-ibm-cloud-private.adoc index 9c9668265c..65bf644a4c 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc +++ b/installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-private"] -= Installing a private cluster on IBM Cloud VPC += Installing a private cluster on {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-private @@ -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/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 account] to host the cluster. +* 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. * 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_public/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 VPC] +* 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}] 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_public/installing-ibm-cloud-vpc.adoc index 5b71e3fe32..9a613a8565 100644 --- a/installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc +++ b/installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc @@ -1,21 +1,21 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-vpc"] -= Installing a cluster on IBM Cloud VPC into an existing VPC += Installing a cluster on {ibm-cloud-title} into an existing VPC include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-vpc toc::[] -In {product-title} version {product-version}, you can install a cluster into an existing Virtual Private Cloud (VPC) on IBM Cloud VPC. The installation program provisions the rest of the required infrastructure, which you can then further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a cluster into an existing Virtual Private Cloud (VPC) on {ibm-cloud-name}. The installation program provisions the rest of the required infrastructure, which you can then further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. [id="prerequisites_installing-ibm-cloud-vpc"] == 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/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 account] to host the cluster. +* 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. * 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_public/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 VPC] +* 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}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] 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 index 3cc45c538a..5a5a82cc99 100644 --- 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 @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="preparing-to-install-on-ibm-cloud"] -= Preparing to install on IBM Cloud VPC += Preparing to install on {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: preparing-to-install-on-ibm-cloud toc::[] -The installation workflows documented in this section are for IBM Cloud VPC infrastructure environments. IBM Cloud Classic is not supported at this time. For more information about the difference between Classic and VPC infrastructures, see the IBM link:https://cloud.ibm.com/docs/cloud-infrastructure?topic=cloud-infrastructure-compare-infrastructure[documentation]. +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 @@ -16,32 +16,32 @@ The installation workflows documented in this section are for IBM Cloud VPC infr * You read the documentation on xref:../../installing/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 VPC +== Requirements for installing {product-title} on {ibm-cloud-title} -Before installing {product-title} on IBM Cloud VPC, you must create a service account and configure an IBM Cloud account. See xref:../../installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc#installing-ibm-cloud-account[Configuring an IBM Cloud account] for details about creating an account, enabling API services, configuring DNS, IBM Cloud account limits, and supported IBM Cloud VPC regions. +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 VPC. 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 VPC]. +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 VPC +== Choosing a method to install {product-title} on {ibm-cloud-title} -You can install {product-title} on IBM Cloud VPC 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 VPC using user-provisioned infrastructure is not supported at this time. +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 VPC infrastructure that is provisioned by the {product-title} installation program by using one of the following methods: +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 VPC]**: You can install a customized cluster on IBM Cloud VPC 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-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 VPC 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-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 VPC into an existing VPC]**: You can install {product-title} on an existing IBM Virtual Private Cloud (VPC). 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-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. [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 account] +* 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/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc b/installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc index 724c99e3fc..c34c9f7c83 100644 --- a/installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc +++ b/installing/installing_ibm_cloud_public/uninstalling-cluster-ibm-cloud.adoc @@ -1,11 +1,11 @@ :_mod-docs-content-type: ASSEMBLY [id="uninstalling-cluster-ibm-cloud"] -= Uninstalling a cluster on IBM Cloud VPC += Uninstalling a cluster on {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: uninstalling-cluster-ibm-cloud toc::[] -You can remove a cluster that you deployed to IBM Cloud VPC. +You can remove a cluster that you deployed to {ibm-cloud-name}. include::modules/installation-uninstall-clouds.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc b/installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc index 51d79eb63f..ca440681c1 100644 --- a/installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc +++ b/installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installation-config-parameters-ibm-power"] -= Installation configuration parameters for {ibmpowerProductName} += Installation configuration parameters for {ibm-power-title} include::_attributes/common-attributes.adoc[] :context: installation-config-parameters-ibm-power :platform: IBM Power diff --git a/installing/installing_ibm_power/installing-ibm-power.adoc b/installing/installing_ibm_power/installing-ibm-power.adoc index 49fa57dc25..933c59c45e 100644 --- a/installing/installing_ibm_power/installing-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-ibm-power.adoc @@ -1,13 +1,13 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-power"] -= Installing a cluster on {ibmpowerProductName} += Installing a cluster on {ibm-power-title} include::_attributes/common-attributes.adoc[] :context: installing-ibm-power toc::[] In {product-title} version {product-version}, you can install a cluster on -{ibmpowerProductName} infrastructure that you provision. +{ibm-power-name} infrastructure that you provision. [IMPORTANT] ==== @@ -75,7 +75,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibmpowerProductName}] +* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibm-power-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] @@ -90,7 +90,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev [id="creating-machines-bare-metal-power"] == Installing {op-system} and starting the {product-title} bootstrap process -To install {product-title} on {ibmpowerProductName} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. +To install {product-title} on {ibm-power-name} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. Follow either the steps to use an ISO image or network PXE booting to install {op-system} on the machines. diff --git a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc index 0f560d867b..1558d6a334 100644 --- a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc @@ -1,13 +1,13 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-restricted-networks-ibm-power"] -= Installing a cluster on {ibmpowerProductName} in a restricted network += Installing a cluster on {ibm-power-title} in a restricted network include::_attributes/common-attributes.adoc[] :context: installing-restricted-networks-ibm-power toc::[] In {product-title} version {product-version}, you can install a cluster on -{ibmpowerProductName} infrastructure that you provision in a restricted network. +{ibm-power-name} infrastructure that you provision in a restricted network. [IMPORTANT] ==== @@ -83,7 +83,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibmpowerProductName}] +* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibm-power-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] @@ -98,7 +98,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev [id="creating-machines-ibm-power-restricted-network"] == Installing {op-system} and starting the {product-title} bootstrap process -To install {product-title} on {ibmpowerProductName} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. +To install {product-title} on {ibm-power-name} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. Follow either the steps to use an ISO image or network PXE booting to install {op-system} on the machines. diff --git a/installing/installing_ibm_power/preparing-to-install-on-ibm-power.adoc b/installing/installing_ibm_power/preparing-to-install-on-ibm-power.adoc index 4f22963594..870b057adc 100644 --- a/installing/installing_ibm_power/preparing-to-install-on-ibm-power.adoc +++ b/installing/installing_ibm_power/preparing-to-install-on-ibm-power.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="preparing-to-install-on-ibm-power"] -= Preparing to install on IBM Power += Preparing to install on {ibm-power-title} include::_attributes/common-attributes.adoc[] :context: preparing-to-install-on-ibm-power @@ -13,10 +13,10 @@ toc::[] * You read the documentation on xref:../../installing/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. [id="choosing-an-method-to-install-ocp-on-ibm-power"] -== Choosing a method to install {product-title} on IBM Power +== Choosing a method to install {product-title} on {ibm-power-title} -You can install a cluster on IBM Power infrastructure that you provision, by using one of the following methods: +You can install a cluster on {ibm-power-name} infrastructure that you provision, by using one of the following methods: -* **xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Installing a cluster on IBM Power]**: You can install {product-title} on IBM Power infrastructure that you provision. +* **xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Installing a cluster on {ibm-power-name}]**: You can install {product-title} on {ibm-power-name} infrastructure that you provision. -* **xref:../../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[Installing a cluster on IBM Power in a restricted network]**: You can install {product-title} on IBM Power infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. +* **xref:../../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[Installing a cluster on {ibm-power-name} in a restricted network]**: You can install {product-title} on {ibm-power-name} infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. diff --git a/installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc b/installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc index c1ecf2da7f..ef60786a0c 100644 --- a/installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc +++ b/installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc @@ -1,10 +1,10 @@ :_mod-docs-content-type: ASSEMBLY [id="creating-ibm-power-vs-workspace"] -= Creating an {ibmpowerProductName} Virtual Server workspace += Creating an {ibm-power-server-title} workspace include::_attributes/common-attributes.adoc[] :context: creating-ibm-power-vs-workspace -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-name} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] include::modules/creating-ibm-power-vs-workspace-procedure.adoc[leveloffset=+1] @@ -12,4 +12,4 @@ include::modules/creating-ibm-power-vs-workspace-procedure.adoc[leveloffset=+1] [id="next-steps_creating-ibm-power-vs-workspace"] == Next steps -* xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc#installing-ibm-power-vs-customizations[Installing a cluster on {ibmpowerProductName} Virtual Server with customizations] +* xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc#installing-ibm-power-vs-customizations[Installing a cluster on {ibm-power-server-name} with customizations] diff --git a/installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc b/installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc index 0c62a72a92..889a9b75fd 100644 --- a/installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc +++ b/installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="installation-config-parameters-ibm-power-vs"] -= Installation configuration parameters for {ibmpowerProductName} Virtual Server += Installation configuration parameters for {ibm-power-server-title} include::_attributes/common-attributes.adoc[] :context: installation-config-parameters-ibm-power-vs -:platform: {ibmpowerProductName} Virtual Server +:platform: {ibm-power-server-title} toc::[] -Before you deploy an {product-title} on {ibmpowerProductName} Virtual Server, you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further. +Before you deploy an {product-title} on {{ibm-power-server-name}, you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further. include::modules/installation-configuration-parameters.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc b/installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc index 2c3f750abf..69c7bbc361 100644 --- a/installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc +++ b/installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc @@ -1,20 +1,20 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-cloud-account-power-vs"] -= Configuring an IBM Cloud account += Configuring an {ibm-cloud-title} account include::_attributes/common-attributes.adoc[] :context: installing-ibm-cloud-account-power-vs toc::[] -Before you can install {product-title}, you must configure an IBM Cloud account. +Before you can install {product-title}, you must configure an {ibm-cloud-name} account. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-title} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="prerequisites_installing-ibm-cloud-account-power-vs"] == Prerequisites -* You have an IBM Cloud account with a subscription. You cannot install {product-title} on a free or on a trial IBM Cloud account. +* You have an {ibm-cloud-name} account with a subscription. You cannot install {product-title} on a free or on a trial {ibm-cloud-name} account. include::modules/quotas-and-limits-ibm-power-vs.adoc[leveloffset=+1] @@ -23,8 +23,8 @@ include::modules/quotas-and-limits-ibm-power-vs.adoc[leveloffset=+1] How you configure DNS resolution depends on the type of {product-title} cluster you are installing: -* If you are installing a public cluster, you use IBM Cloud Internet Services (CIS). -* If you are installing a private cluster, you use IBM Cloud DNS Services (DNS Services). +* If you are installing a public cluster, you use {ibm-cloud-name} Internet Services (CIS). +* If you are installing a private cluster, you use {ibm-cloud-name} DNS Services (DNS Services). include::modules/installation-cis-ibm-cloud.adoc[leveloffset=+1] @@ -36,4 +36,4 @@ include::modules/installation-ibm-cloud-regions.adoc[leveloffset=+1] [id="next-steps_installing-ibm-cloud-account-power-vs"] == Next steps -* xref:../../installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc#creating-ibm-power-vs-workspace[Creating an {ibmpowerProductName} Virtual Server workspace] +* xref:../../installing/installing_ibm_powervs/creating-ibm-power-vs-workspace.adoc#creating-ibm-power-vs-workspace[Creating an {ibm-power-server-name} workspace] diff --git a/installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc b/installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc index 3ab0e14ba4..4e2a84a82b 100644 --- a/installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc +++ b/installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc @@ -1,14 +1,14 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-power-vs-customizations"] -= Installing a cluster on {ibmpowerProductName} Virtual Server with customizations += Installing a cluster on {ibm-power-server-title} with customizations include::_attributes/common-attributes.adoc[] :context: installing-ibm-power-vs-customizations toc::[] -In {product-title} version {product-version}, you can install a customized cluster on infrastructure that the installation program provisions on {ibmpowerProductName} Virtual Server. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a customized cluster on infrastructure that the installation program provisions on {ibm-power-server-title}. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-title} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="prerequisites_installing-ibm-powervs-customizations"] @@ -16,7 +16,7 @@ include::snippets/technology-preview.adoc[] * 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/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[configured an IBM Cloud account] to host the cluster. +* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[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_powervs/preparing-to-install-on-ibm-power-vs.adoc#cco-ccoctl-configuring_preparing-to-install-on-ibm-power-vs[Configuring the Cloud Credential Operator utility]. @@ -32,7 +32,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server] +* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibm-power-server-name}] include::modules/installation-ibm-power-vs-config-yaml.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc b/installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc index 0bae377721..243f5af484 100644 --- a/installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc +++ b/installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc @@ -1,14 +1,14 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-power-vs-private-cluster"] -= Installing a private cluster on {ibmpowerProductName} Virtual Server += Installing a private cluster on {ibm-power-server-title} include::_attributes/common-attributes.adoc[] :context: installing-ibm-power-vs-private-cluster toc::[] -In {product-title} version {product-version}, you can install a private cluster into an existing VPC and {ibmpowerProductName} Virtual Server Workspace. The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a private cluster into an existing VPC and {ibm-power-server-name} Workspace. The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-name} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="prerequisites_installing-ibm-power-vs-private-cluster"] @@ -16,7 +16,7 @@ include::snippets/technology-preview.adoc[] * 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/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[configured an IBM Cloud account] to host the cluster. +* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[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_powervs/preparing-to-install-on-ibm-power-vs.adoc#cco-ccoctl-configuring_preparing-to-install-on-ibm-power-vs[Configuring the Cloud Credential Operator utility]. @@ -38,7 +38,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server] +* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibm-power-server-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc b/installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc index 45af55effb..d159640e29 100644 --- a/installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc +++ b/installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc @@ -1,14 +1,14 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-powervs-vpc"] -= Installing a cluster on {ibmpowerProductName} Virtual Server into an existing VPC += Installing a cluster on {ibm-power-server-title} into an existing VPC include::_attributes/common-attributes.adoc[] :context: installing-ibm-powervs-vpc toc::[] -In {product-title} version {product-version}, you can install a cluster into an existing Virtual Private Cloud (VPC) on IBM Cloud VPC. The installation program provisions the rest of the required infrastructure, which you can then further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a cluster into an existing Virtual Private Cloud (VPC) on {ibm-cloud-name}. The installation program provisions the rest of the required infrastructure, which you can then further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-name} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="prerequisites_installing-ibm-powervs-vpc"] @@ -16,7 +16,7 @@ include::snippets/technology-preview.adoc[] * 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/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[configured an IBM Cloud account] to host the cluster. +* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[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_powervs/preparing-to-install-on-ibm-power-vs.adoc#cco-ccoctl-configuring_preparing-to-install-on-ibm-power-vs[Configuring the Cloud Credential Operator utility]. @@ -34,7 +34,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server] +* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibm-power-server-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc b/installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc index 9d199ba786..7603c661a2 100644 --- a/installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc +++ b/installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc @@ -1,14 +1,14 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-restricted-networks-ibm-power-vs"] -= Installing a cluster on {ibmpowerProductName} Virtual Server in a restricted network += Installing a cluster on {ibm-power-server-title} in a restricted network include::_attributes/common-attributes.adoc[] :context: installing-restricted-networks-ibm-power-vs toc::[] -In {product-title} {product-version}, you can install a cluster on IBM Cloud VPC in a restricted network by creating an internal mirror of the installation release content on an existing Virtual Private Cloud (VPC) on IBM Cloud VPC. +In {product-title} {product-version}, you can install a cluster on {ibm-cloud-name} in a restricted network by creating an internal mirror of the installation release content on an existing Virtual Private Cloud (VPC) on {ibm-cloud-name}. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-name} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="prerequisites_installing-ibm-power-vs-restricted"] @@ -16,14 +16,14 @@ include::snippets/technology-preview.adoc[] * 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/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[configured an IBM Cloud account] to host the cluster. +* You xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[configured an {ibm-cloud-name} account] to host the cluster. * You xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[mirrored the images for a disconnected installation] to your registry and obtained the `imageContentSources` data for your version of {product-title}. + [IMPORTANT] ==== Because the installation media is on the mirror host, you can use that computer to complete all installation steps. ==== -* You have an existing VPC in IBM Cloud VPC. When installing a cluster in a restricted network, you cannot use the installer-provisioned VPC. You must use a user-provisioned VPC that satisfies one of the following requirements: +* You have an existing VPC in {ibm-cloud-name}. When installing a cluster in a restricted network, you cannot use the installer-provisioned VPC. You must use a user-provisioned VPC that satisfies one of the following requirements: ** Contains the mirror registry ** Has firewall rules or a peering connection to access the mirror registry hosted elsewhere * 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. @@ -43,7 +43,7 @@ include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibmpowerProductName} Virtual Server] +* xref:../../installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs#installation-config-parameters-ibm-power-vs[Installation configuration parameters for {ibm-power-server-name}] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.adoc b/installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.adoc index a3e2d223e1..cebbb9076b 100644 --- a/installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.adoc +++ b/installing/installing_ibm_powervs/preparing-to-install-on-ibm-power-vs.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="preparing-to-install-on-ibm-power-vs"] -= Preparing to install on {ibmpowerProductName} Virtual Server += Preparing to install on {ibm-power-server-title} include::_attributes/common-attributes.adoc[] :context: preparing-to-install-on-ibm-power-vs toc::[] -The installation workflows documented in this section are for {ibmpowerProductName} Virtual Server infrastructure environments. +The installation workflows documented in this section are for {ibm-power-server-name} infrastructure environments. [id="prerequisites_preparing-to-install-on-ibm-power-vs"] == Prerequisites @@ -15,35 +15,35 @@ The installation workflows documented in this section are for {ibmpowerProductNa * You read the documentation on xref:../../installing/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -:FeatureName: {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure +:FeatureName: {ibm-power-server-name} using installer-provisioned infrastructure include::snippets/technology-preview.adoc[] [id="requirements-for-installing-ocp-on-ibm-power-vs"] -== Requirements for installing {product-title} on {ibmpowerProductName} Virtual Server +== Requirements for installing {product-title} on {ibm-power-server-title} -Before installing {product-title} on {ibmpowerProductName} Virtual Server, you must create a service account and configure an IBM Cloud account. See xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[Configuring an IBM Cloud account] for details about creating an account, configuring DNS and supported {ibmpowerProductName} Virtual Server regions. +Before installing {product-title} on {ibm-power-server-name} you must create a service account and configure an {ibm-cloud-name} account. See xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[Configuring an {ibm-cloud-name} account] for details about creating an account, configuring DNS and supported {ibm-power-server-name} regions. -You must manually manage your cloud credentials when installing a cluster to {ibmpowerProductName} Virtual Server. Do this by configuring the Cloud Credential Operator (CCO) for manual mode before you install the cluster. +You must manually manage your cloud credentials when installing a cluster to {ibm-power-server-name}. Do this by configuring the Cloud Credential Operator (CCO) for manual mode before you install the cluster. [id="choosing-a-method-to-install-ocp-on-ibm-power-vs"] -== Choosing a method to install {product-title} on {ibmpowerProductName} Virtual Server +== Choosing a method to install {product-title} on {ibm-power-server-title} -You can install {product-title} on {ibmpowerProductName} Virtual Server using installer-provisioned infrastructure. This process involves using an installation program to provision the underlying infrastructure for your cluster. Installing {product-title} on {ibmpowerProductName} Virtual Server using user-provisioned infrastructure is not supported at this time. +You can install {product-title} on {ibm-power-server-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-power-server-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-power-vs-installer-provisioned"] === Installing a cluster on installer-provisioned infrastructure -You can install a cluster on {ibmpowerProductName} Virtual Server infrastructure that is provisioned by the {product-title} installation program by using one of the following methods: +You can install a cluster on {ibm-power-server-name} infrastructure that is provisioned by the {product-title} installation program by using one of the following methods: -* **xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc#installing-ibm-power-vs-customizations[Installing a customized cluster on {ibmpowerProductName} Virtual Server]**: You can install a customized cluster on {ibmpowerProductName} Virtual Server 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_powervs/installing-ibm-power-vs-customizations.adoc#installing-ibm-power-vs-customizations[Installing a customized cluster on {ibm-power-server-name}]**: You can install a customized cluster on {ibm-power-server-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_powervs/installing-ibm-powervs-vpc.adoc#installing-ibm-powervs-vpc[Installing a cluster on {ibmpowerProductName} Virtual Server into an existing VPC]**: You can install {product-title} on {ibmpowerProductName} Virtual Server into an existing Virtual Private Cloud (VPC). 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_powervs/installing-ibm-powervs-vpc.adoc#installing-ibm-powervs-vpc[Installing a cluster on {ibm-power-server-name} into an existing VPC]**: You can install {product-title} on {ibm-power-server-name} into an existing Virtual Private Cloud (VPC). 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_powervs/installing-ibm-power-vs-private-cluster.adoc#installing-ibm-power-vs-private-cluster[Installing a private cluster on {ibmpowerProductName} Virtual Server]**: You can install a private cluster on {ibmpowerProductName} Virtual Server. You can use this method to deploy {product-title} on an internal network that is not visible to the internet. +* **xref:../../installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc#installing-ibm-power-vs-private-cluster[Installing a private cluster on {ibm-power-server-name}]**: You can install a private cluster on {ibm-power-server-name}. You can use this method to deploy {product-title} on an internal network that is not visible to the internet. -* **xref:../../installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc#installing-restricted-networks-ibm-power-vs[Installing a cluster on {ibmpowerProductName} Virtual Server in a restricted network]**: You can install {product-title} on {ibmpowerProductName} Virtual Server 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. +* **xref:../../installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc#installing-restricted-networks-ibm-power-vs[Installing a cluster on {ibm-power-server-name} in a restricted network]**: You can install {product-title} on {ibm-power-server-name} 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. include::modules/cco-ccoctl-configuring.adoc[leveloffset=+1] @@ -55,4 +55,4 @@ include::modules/cco-ccoctl-configuring.adoc[leveloffset=+1] [id="next-steps_preparing-to-install-on-ibm-power-vs"] == Next steps -* xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[Configuring an IBM Cloud account] \ No newline at end of file +* xref:../../installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc#installing-ibm-cloud-account-power-vs[Configuring an {ibm-cloud-name} account] \ No newline at end of file diff --git a/installing/installing_ibm_powervs/uninstalling-cluster-ibm-power-vs.adoc b/installing/installing_ibm_powervs/uninstalling-cluster-ibm-power-vs.adoc index 8b652ace27..b0f52f7b21 100644 --- a/installing/installing_ibm_powervs/uninstalling-cluster-ibm-power-vs.adoc +++ b/installing/installing_ibm_powervs/uninstalling-cluster-ibm-power-vs.adoc @@ -1,11 +1,11 @@ :_mod-docs-content-type: ASSEMBLY [id="uninstalling-cluster-ibm-power-vs"] -= Uninstalling a cluster on {ibmpowerProductName} Virtual Server += Uninstalling a cluster on {ibm-power-server-title} include::_attributes/common-attributes.adoc[] :context: uninstalling-cluster-ibm-power-vs toc::[] -You can remove a cluster that you deployed to {ibmpowerProductName} Virtual Server. +You can remove a cluster that you deployed to {ibm-power-server-name}. include::modules/installation-uninstall-clouds.adoc[leveloffset=+1] \ No newline at end of file diff --git a/installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc b/installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc index 1ed7faafcd..c1d4c0e2df 100644 --- a/installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc +++ b/installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installation-config-parameters-ibm-z"] -= Installation configuration parameters for IBM Z(R) and {linuxoneProductName} += Installation configuration parameters for {ibm-z-title} and {ibm-linuxone-title} include::_attributes/common-attributes.adoc[] :context: installation-config-parameters-ibm-z :platform: IBM Z @@ -11,7 +11,7 @@ Before you deploy an {product-title} cluster, you provide a customized `install- [NOTE] ==== -While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers only to {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== include::modules/installation-configuration-parameters.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_z/installing-ibm-z-kvm.adoc b/installing/installing_ibm_z/installing-ibm-z-kvm.adoc index e519923543..6dc0aa14d1 100644 --- a/installing/installing_ibm_z/installing-ibm-z-kvm.adoc +++ b/installing/installing_ibm_z/installing-ibm-z-kvm.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-z-kvm"] -= Installing a cluster with {op-system-base} KVM on IBM Z(R) and {linuxoneProductName} += Installing a cluster with {op-system-base} KVM on {ibm-z-title} and {ibm-linuxone-title} include::_attributes/common-attributes.adoc[] :context: installing-ibm-z-kvm @@ -8,11 +8,11 @@ toc::[] [role="_abstract"] In {product-title} version {product-version}, you can install a cluster on -{ibmzProductName} or {linuxoneProductName} infrastructure that you provision. +{ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision. [NOTE] ==== -While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers only to {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== [IMPORTANT] @@ -45,7 +45,7 @@ include::modules/csr-management.adoc[leveloffset=+2] [id="additional-resources_ibmz-kvm-recommended-host-practices"] .Additional resources -* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & {linuxoneProductName} environments] +* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibm-z-name} & {ibm-linuxone-name} environments] include::modules/installation-network-user-infra.adoc[leveloffset=+2] @@ -73,7 +73,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}] +* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibm-z-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] @@ -93,9 +93,9 @@ include::modules/ibm-z-secure-execution.adoc[leveloffset=+2] [id="additional-resources_Linux-as-an-IBM-Secure-Execution-host-or-guest"] .Additional resources -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=virtualization-secure-execution[Introducing IBM Secure Execution for Linux] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=virtualization-secure-execution[Introducing {ibm-name} Secure Execution for Linux] -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=ibmz-secure-execution[Linux as an IBM Secure Execution host or guest] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=ibmz-secure-execution[Linux as an {ibm-name} Secure Execution host or guest] include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_z/installing-ibm-z.adoc b/installing/installing_ibm_z/installing-ibm-z.adoc index da479f5776..4751af1ee2 100644 --- a/installing/installing_ibm_z/installing-ibm-z.adoc +++ b/installing/installing_ibm_z/installing-ibm-z.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-ibm-z"] -= Installing a cluster with z/VM on IBM Z(R) and {linuxoneProductName} += Installing a cluster with z/VM on {ibm-z-title} and {ibm-linuxone-title} include::_attributes/common-attributes.adoc[] :context: installing-ibm-z @@ -8,11 +8,11 @@ toc::[] [role="_abstract"] In {product-title} version {product-version}, you can install a cluster on -{ibmzProductName} or {linuxoneProductName} infrastructure that you provision. +{ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision. [NOTE] ==== -While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers only to {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== [IMPORTANT] @@ -60,13 +60,13 @@ include::modules/csr-management.adoc[leveloffset=+2] [id="additional-resources_ibmz-requirements"] .Additional resources -* See link:https://www.ibm.com/docs/en/zvm/latest?topic=networks-bridging-hipersockets-lan-zvm-virtual-switch[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in IBM Documentation. +* See link:https://www.ibm.com/docs/en/zvm/latest?topic=networks-bridging-hipersockets-lan-zvm-virtual-switch[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in {ibm-name} Documentation. * See link:https://public.dhe.ibm.com/software/dw/linux390/perf/zvm_hpav00.pdf[Scaling HyperPAV alias devices on Linux guests on z/VM] for performance optimization. * See link:https://www.vm.ibm.com/library/presentations/lparperf.pdf[Topics in LPAR performance] for LPAR weight management and entitlements. -* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & {linuxoneProductName} environments] +* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibm-z-name} & {ibm-linuxone-name} environments] include::modules/installation-network-user-infra.adoc[leveloffset=+2] @@ -94,7 +94,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}] +* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibm-z-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc b/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc index acbb84922a..b38ed362b4 100644 --- a/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc +++ b/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-restricted-networks-ibm-z-kvm"] -= Installing a cluster with {op-system-base} KVM on IBM Z(R) and {linuxoneProductName} in a restricted network += Installing a cluster with {op-system-base} KVM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network include::_attributes/common-attributes.adoc[] :context: installing-restricted-networks-ibm-z-kvm @@ -8,11 +8,11 @@ toc::[] [role="_abstract"] In {product-title} version {product-version}, you can install a cluster on -{ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted network. +{ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted network. [NOTE] ==== -While this document refers to only {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers to only {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== [IMPORTANT] @@ -52,7 +52,7 @@ include::modules/csr-management.adoc[leveloffset=+2] [id="additional-resources_ibmz-kvm-restricted-recommended-host-practices"] .Additional resources -* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & {linuxoneProductName} environments] +* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibm-z-name} & {ibm-linuxone-name} environments] include::modules/installation-network-user-infra.adoc[leveloffset=+2] @@ -80,7 +80,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}] +* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibm-z-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] @@ -100,9 +100,9 @@ include::modules/ibm-z-secure-execution.adoc[leveloffset=+2] [id="additional-resources_Linux-as-an-IBM-Secure-Execution-host-or-guest-restricted"] .Additional resources -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=virtualization-secure-execution[Introducing IBM Secure Execution for Linux] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=virtualization-secure-execution[Introducing {ibm-name} Secure Execution for Linux] -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=ibmz-secure-execution[Linux as an IBM Secure Execution host or guest] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=ibmz-secure-execution[Linux as an {ibm-name} Secure Execution host or guest] include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc b/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc index d97505a126..48e4ca3f57 100644 --- a/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc +++ b/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="installing-restricted-networks-ibm-z"] -= Installing a cluster with z/VM on IBM Z(R) and {linuxoneProductName} in a restricted network += Installing a cluster with z/VM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network include::_attributes/common-attributes.adoc[] :context: installing-restricted-networks-ibm-z @@ -8,11 +8,11 @@ toc::[] [role="_abstract"] In {product-title} version {product-version}, you can install a cluster on -{ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted network. +{ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted network. [NOTE] ==== -While this document refers to only {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers to only {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== [IMPORTANT] @@ -67,13 +67,13 @@ include::modules/csr-management.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* See link:https://www.ibm.com/docs/en/zvm/latest?topic=networks-bridging-hipersockets-lan-zvm-virtual-switch[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in IBM Documentation. +* See link:https://www.ibm.com/docs/en/zvm/latest?topic=networks-bridging-hipersockets-lan-zvm-virtual-switch[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in {ibm-name} Documentation. * See link:https://public.dhe.ibm.com/software/dw/linux390/perf/zvm_hpav00.pdf[Scaling HyperPAV alias devices on Linux guests on z/VM] for performance optimization. * See link:https://www.vm.ibm.com/library/presentations/lparperf.pdf[Topics in LPAR performance] for LPAR weight management and entitlements. -* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & {linuxoneProductName} environments] +* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibm-z-name} & {ibm-linuxone-name} environments] include::modules/installation-network-user-infra.adoc[leveloffset=+2] @@ -100,7 +100,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}] +* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibm-z-name}] include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2] diff --git a/installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc b/installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc index 6a778f9a7b..18c639e9c5 100644 --- a/installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc +++ b/installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="preparing-to-install-on-ibm-z"] -= Preparing to install on IBM Z(R) and {linuxoneProductName} += Preparing to install on {ibm-z-title} and {ibm-linuxone-title} include::_attributes/common-attributes.adoc[] :context: preparing-to-install-on-ibm-z @@ -17,13 +17,13 @@ toc::[] [NOTE] ==== -While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}. +While this document refers only to {ibm-z-name}, all information in it also applies to {ibm-linuxone-name}. ==== [id="choosing-an-method-to-install-ocp-on-ibm-z"] -== Choosing a method to install {product-title} on {ibmzProductName} or {linuxoneProductName} +== Choosing a method to install {product-title} on {ibm-z-title} or {ibm-linuxone-title} -You can install {product-title} with the link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[{ai-full}]. This method requires no setup for the installer, and is ideal for connected environments like {ibmzProductName}. +You can install {product-title} with the link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[{ai-full}]. This method requires no setup for the installer, and is ideal for connected environments like {ibm-z-name}. See xref:../../installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc#installing-on-prem-assisted[Installing an on-premise cluster using the {ai-full}] for additional details. You can also install {product-title} on infrastructure that you provide. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself. @@ -32,17 +32,17 @@ See the xref:../../architecture/architecture-installation.adoc#installation-proc [IMPORTANT] ==== -The steps for performing a user-provisioned infrastructure installation are provided as an example only. Installing a cluster with infrastructure you provide requires knowledge of the {ibmzProductName} platform and the installation process of {product-title}. Use the user-provisioned infrastructure installation instructions as a guide; you are free to create the required resources through other methods. +The steps for performing a user-provisioned infrastructure installation are provided as an example only. Installing a cluster with infrastructure you provide requires knowledge of the {ibm-z-name} platform and the installation process of {product-title}. Use the user-provisioned infrastructure installation instructions as a guide; you are free to create the required resources through other methods. ==== -=== User-provisioned infrastructure installation of {product-title} on {ibmzProductName} +=== User-provisioned infrastructure installation of {product-title} on {ibm-z-title} User-provisioned infrastructure requires the user to provision all resources required by {product-title}. -* **xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}]**: You can install {product-title} with z/VM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision. +* **xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} with z/VM on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision. -* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName} in a restricted network]**: You can install {product-title} with z/VM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. +* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with z/VM on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. -* **xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with RHEL KVM on {ibmzProductName} and {linuxoneProductName}]**: You can install {product-title} with KVM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision. +* **xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with RHEL KVM on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} with KVM on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision. -* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibmzProductName} and {linuxoneProductName} in a restricted network]**: You can install {product-title} with {op-system-base} KVM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. +* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with {op-system-base} KVM on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted or disconnected network, 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. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content. diff --git a/installing/installing_sno/install-sno-installing-sno.adoc b/installing/installing_sno/install-sno-installing-sno.adoc index 84fc68cb31..9e5111fd4f 100644 --- a/installing/installing_sno/install-sno-installing-sno.adoc +++ b/installing/installing_sno/install-sno-installing-sno.adoc @@ -98,13 +98,13 @@ include::modules/install-booting-from-an-iso-over-http-redfish.adoc[leveloffset= include::modules/creating-custom-live-rhcos-iso.adoc[leveloffset=+1] [id="install-sno-with-ibmz"] -== Installing {sno} with {ibmzProductName} and {linuxoneProductName} +== Installing {sno} with {ibm-z-title} and {ibm-linuxone-title} -Installing a single-node cluster on {ibmzProductName} and {linuxoneProductName} requires user-provisioned installation using either the "Installing a cluster with {op-system-base} KVM on {ibmzProductName} and {linuxoneProductName}" or the "Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}" procedure. +Installing a single-node cluster on {ibm-z-name} and {ibm-linuxone-name} requires user-provisioned installation using either the "Installing a cluster with {op-system-base} KVM on {ibm-z-name} and {ibm-linuxone-name}" or the "Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}" procedure. [NOTE] ==== -Installing a single-node cluster on {ibmzProductName} simplifies installation for development and test environments and requires less resource requirements at entry level. +Installing a single-node cluster on {ibm-z-name} simplifies installation for development and test environments and requires less resource requirements at entry level. ==== [discrete] @@ -115,28 +115,28 @@ Installing a single-node cluster on {ibmzProductName} simplifies installation fo [NOTE] ==== -You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmzProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. +You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibm-z-name}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. ==== [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}] +* xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}] -* xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibmzProductName} and{linuxoneProductName}] +* xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibm-z-name} and{ibm-linuxone-name}] include::modules/install-sno-ibm-z.adoc[leveloffset=+2] include::modules/install-sno-ibm-z-kvm.adoc[leveloffset=+2] [id="installing-sno-with-ibmpower"] -== Installing {sno} with {ibmpowerProductName} +== Installing {sno} with {ibm-power-title} -Installing a single-node cluster on {ibmpowerProductName} requires user-provisioned installation using the "Installing a cluster with {ibmpowerProductName}" procedure. +Installing a single-node cluster on {ibm-power-name} requires user-provisioned installation using the "Installing a cluster with {ibm-power-name}" procedure. [NOTE] ==== -Installing a single-node cluster on {ibmpowerProductName} simplifies installation for development and test environments and requires less resource requirements at entry level. +Installing a single-node cluster on {ibm-power-name} simplifies installation for development and test environments and requires less resource requirements at entry level. ==== [discrete] @@ -147,13 +147,13 @@ Installing a single-node cluster on {ibmpowerProductName} simplifies installatio [NOTE] ==== -You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmpowerProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. +You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibm-power-name}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. ==== [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Installing a cluster on {ibmpowerProductName}] +* xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Installing a cluster on {ibm-power-name}] include::modules/setting-up-bastion-for-sno.adoc[leveloffset=+2] diff --git a/machine_management/control_plane_machine_management/cpmso-about.adoc b/machine_management/control_plane_machine_management/cpmso-about.adoc index 9d493d279e..43b3eb8528 100644 --- a/machine_management/control_plane_machine_management/cpmso-about.adoc +++ b/machine_management/control_plane_machine_management/cpmso-about.adoc @@ -25,7 +25,7 @@ The Control Plane Machine Set Operator has the following limitations: * The Operator requires the Machine API Operator to be operational and is therefore not supported on clusters with manually provisioned machines. When installing a {product-title} cluster with manually provisioned machines for a platform that creates an active generated `ControlPlaneMachineSet` custom resource (CR), you must remove the Kubernetes manifest files that define the control plane machine set as instructed in the installation process. -* Only Amazon Web Services (AWS), Google Cloud Platform (GCP), {ibmpowerProductName} Virtual Server, Microsoft Azure, Nutanix, VMware vSphere, and {rh-openstack-first} clusters are supported. +* Only Amazon Web Services (AWS), Google Cloud Platform (GCP), {ibm-power-server-name}, Microsoft Azure, Nutanix, VMware vSphere, and {rh-openstack-first} clusters are supported. * Only clusters with three control plane machines are supported. diff --git a/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc b/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc index 296581a7cb..20ebffdeb2 100644 --- a/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc +++ b/machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="creating-machineset-ibm-cloud"] -= Creating a compute machine set on IBM Cloud += Creating a compute machine set on {ibm-cloud-title} include::_attributes/common-attributes.adoc[] :context: creating-machineset-ibm-cloud toc::[] -You can create a different compute machine set to serve a specific purpose in your {product-title} cluster on IBM Cloud. For example, you might create infrastructure machine sets and related machines so that you can move supporting workloads to the new machines. +You can create a different compute machine set to serve a specific purpose in your {product-title} cluster on {ibm-cloud-name}. For example, you might create infrastructure machine sets and related machines so that you can move supporting workloads to the new machines. //[IMPORTANT] admonition for UPI include::modules/machine-user-provisioned-limitations.adoc[leveloffset=+1] 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 279ee5c619..c4773e4b91 100644 --- a/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc +++ b/machine_management/creating_machinesets/creating-machineset-ibm-power-vs.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="creating-machineset-ibm-power-vs"] -= Creating a compute machine set on {ibmpowerProductName} Virtual Server += Creating a compute machine set on {ibm-power-server-title} include::_attributes/common-attributes.adoc[] :context: creating-machineset-ibm-power-vs toc::[] -You can create a different compute machine set to serve a specific purpose in your {product-title} cluster on {ibmpowerProductName} Virtual Server. For example, you might create infrastructure machine sets and related machines so that you can move supporting workloads to the new machines. +You can create a different compute machine set to serve a specific purpose in your {product-title} cluster on {ibm-power-server-name}. For example, you might create infrastructure machine sets and related machines so that you can move supporting workloads to the new machines. //[IMPORTANT] admonition for UPI include::modules/machine-user-provisioned-limitations.adoc[leveloffset=+1] diff --git a/modules/about-manually-maintained-credentials-upgrade.adoc b/modules/about-manually-maintained-credentials-upgrade.adoc index 416d1982b0..06435d5a5c 100644 --- a/modules/about-manually-maintained-credentials-upgrade.adoc +++ b/modules/about-manually-maintained-credentials-upgrade.adoc @@ -33,7 +33,7 @@ These platforms do not support using the CCO in manual mode. Clusters on these p + Administrators of clusters on these platforms should skip the manually maintained credentials section of the update process. -{alibaba}, IBM Cloud, and Nutanix:: +{alibaba}, {ibm-cloud-title}, and Nutanix:: Clusters installed on these platforms are configured using the `ccoctl` utility. + Administrators of clusters on these platforms must take the following actions: 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 d178faaf7e..aa5ed2224b 100644 --- a/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc +++ b/modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc @@ -12,7 +12,7 @@ endif::[] The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubernetes custom resource definitions (CRDs). You can configure the CCO to suit the security requirements of your organization by setting different values for the `credentialsMode` parameter in the `install-config.yaml` file. ifdef::ibm-cloud[] -Storing an administrator-level credential secret in the cluster `kube-system` project is not supported for IBM Cloud; therefore, you must set the `credentialsMode` parameter for the CCO to `Manual` when installing {product-title} and manage your cloud credentials manually. +Storing an administrator-level credential secret in the cluster `kube-system` project is not supported for {ibm-cloud-name}; therefore, you must set the `credentialsMode` parameter for the CCO to `Manual` when installing {product-title} and manage your cloud credentials manually. Using manual mode allows each cluster component to have only the permissions it requires, without storing an administrator-level credential in the cluster. You can also use this mode if your environment does not have connectivity to the cloud provider public IAM endpoint. However, you must manually reconcile permissions with new release images for every upgrade. You must also manually supply credentials for every component that requests them. endif::ibm-cloud[] diff --git a/modules/cco-ccoctl-configuring.adoc b/modules/cco-ccoctl-configuring.adoc index 92ef6adefa..f165f2754a 100644 --- a/modules/cco-ccoctl-configuring.adoc +++ b/modules/cco-ccoctl-configuring.adoc @@ -135,7 +135,7 @@ ifdef::nutanix[] The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubernetes custom resource definitions (CRDs). To install a cluster on Nutanix, you must set the CCO to `manual` mode as part of the installation process. endif::nutanix[] ifdef::ibm-power-vs[] -The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubernetes custom resource definitions (CRDs). To install a cluster on {ibmpowerProductName} Virtual Server, you must set the CCO to `manual` mode as part of the installation process. +The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubernetes custom resource definitions (CRDs). To install a cluster on {ibm-power-server-name}, you must set the CCO to `manual` mode as part of the installation process. endif::ibm-power-vs[] //Alibaba Cloud uses ccoctl, but creates different kinds of resources than other clouds, so this applies to everyone else. The upgrade procs also have a different intro, so they are excluded here. diff --git a/modules/cco-ccoctl-upgrading.adoc b/modules/cco-ccoctl-upgrading.adoc index 5c9eed9f40..f0faf56867 100644 --- a/modules/cco-ccoctl-upgrading.adoc +++ b/modules/cco-ccoctl-upgrading.adoc @@ -85,7 +85,7 @@ $ ccoctl gcp create-all \ <5> Optional: Specify the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run. ==== + -.IBM Cloud +.{ibm-cloud-title} [%collapsible] ==== [source,terminal] diff --git a/modules/cluster-cloud-controller-manager-operator.adoc b/modules/cluster-cloud-controller-manager-operator.adoc index 0f1791b296..faf8ace089 100644 --- a/modules/cluster-cloud-controller-manager-operator.adoc +++ b/modules/cluster-cloud-controller-manager-operator.adoc @@ -10,9 +10,9 @@ [NOTE] ==== -The status of this Operator is General Availability for Amazon Web Services (AWS), IBM Cloud, global Microsoft Azure, Microsoft Azure Stack Hub, Nutanix, {rh-openstack-first}, and VMware vSphere. +The status of this Operator is General Availability for Amazon Web Services (AWS), {ibm-cloud-name}, global Microsoft Azure, Microsoft Azure Stack Hub, Nutanix, {rh-openstack-first}, and VMware vSphere. -The Operator is available as a link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] for Alibaba Cloud, Google Cloud Platform (GCP), and IBM Cloud Power VS. +The Operator is available as a link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] for Alibaba Cloud, Google Cloud Platform (GCP), and {ibm-cloud-name} Power VS. ==== The Cluster Cloud Controller Manager Operator manages and updates the cloud controller managers deployed on top of {product-title}. The Operator is based on the Kubebuilder framework and `controller-runtime` libraries. It is installed via the Cluster Version Operator (CVO). diff --git a/modules/configuring-ovnk-additional-networks.adoc b/modules/configuring-ovnk-additional-networks.adoc index cd9faecbbc..80f387b610 100644 --- a/modules/configuring-ovnk-additional-networks.adoc +++ b/modules/configuring-ovnk-additional-networks.adoc @@ -26,8 +26,8 @@ Networks names must be unique. For example, creating multiple `NetworkAttachment You can use an OVN-Kubernetes additional network with the following supported platforms: - Bare metal -- {ibmpowerProductName} -- {ibmzProductName} -- {linuxoneProductName} +- {ibm-power-name} +- {ibm-z-name} +- {ibm-linuxone-name} - VMware vSphere - {rh-openstack-first} diff --git a/modules/creating-ibm-power-vs-workspace-procedure.adoc b/modules/creating-ibm-power-vs-workspace-procedure.adoc index 83ea738aa9..cfde2fa57b 100644 --- a/modules/creating-ibm-power-vs-workspace-procedure.adoc +++ b/modules/creating-ibm-power-vs-workspace-procedure.adoc @@ -2,13 +2,13 @@ :_mod-docs-content-type: PROCEDURE [id="creating-ibm-power-vs-workspace-procedure_{context}"] -= Creating an {ibmpowerProductName} Virtual Server workspace += Creating an {ibm-power-server-title} workspace -Use the following procedure to create an {ibmpowerProductName} Virtual Server workspace. +Use the following procedure to create an {ibm-power-server-name} workspace. .Procedure -. To create an {ibmpowerProductName} Virtual Server workspace, complete step 1 to step 5 from the IBM Cloud documentation for link:https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server[Creating an IBM Power Virtual Server]. +. To create an {ibm-power-server-name} workspace, complete step 1 to step 5 from the {ibm-cloud-name} documentation for link:https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server[Creating an {ibm-power-server-name}]. . After it has finished provisioning, retrieve the 32-character alphanumeric Globally Unique Identifier (GUID) of your new workspace by entering the following command: + diff --git a/modules/deploy-red-hat-openshift-container-storage.adoc b/modules/deploy-red-hat-openshift-container-storage.adoc index 089a18788f..078182918c 100644 --- a/modules/deploy-red-hat-openshift-container-storage.adoc +++ b/modules/deploy-red-hat-openshift-container-storage.adoc @@ -32,11 +32,11 @@ |Instructions on deploying and managing {rh-storage} on existing Red Hat {product-title} Azure clusters |link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html/deploying_openshift_data_foundation_using_microsoft_azure/index[Deploying and managing OpenShift Data Foundation 4.12 using Microsoft Azure] -|Instructions on deploying {rh-storage} to use local storage on IBM Power infrastructure -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html-single/deploying_openshift_data_foundation_using_ibm_power/index[Deploying OpenShift Data Foundation on IBM Power] +|Instructions on deploying {rh-storage} to use local storage on {ibm-power-name} infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html-single/deploying_openshift_data_foundation_using_ibm_power/index[Deploying OpenShift Data Foundation on {ibm-power-name}] -|Instructions on deploying {rh-storage} to use local storage on IBM Z infrastructure -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html/deploying_openshift_data_foundation_using_ibm_z_infrastructure/index[Deploying OpenShift Data Foundation on IBM Z infrastructure] +|Instructions on deploying {rh-storage} to use local storage on {ibm-z-name} infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html/deploying_openshift_data_foundation_using_ibm_z_infrastructure/index[Deploying OpenShift Data Foundation on {ibm-z-name} infrastructure] |Allocating storage to core services and hosted applications in {rh-storage-first}, including snapshot and clone |link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html/managing_and_allocating_storage_resources[Managing and allocating resources] diff --git a/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-power.adoc b/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-power.adoc index 34fd462aec..d2f55ca78f 100644 --- a/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-power.adoc +++ b/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-power.adoc @@ -3,7 +3,7 @@ // * cli_reference/developer_cli_odo/installing-odo.adoc [id="installing-odo-on-linux-on-ibm-power_{context}"] -= Installing {odo-title} on Linux on IBM Power += Installing {odo-title} on Linux on {ibm-power-title} [id="installing-odo-on-linux-on-ibm-power-binary_{context}"] == Binary installation diff --git a/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-z.adoc b/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-z.adoc index 38ab5abb40..24981bc2e1 100644 --- a/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-z.adoc +++ b/modules/developer-cli-odo-installing-odo-on-linux-on-ibm-z.adoc @@ -4,7 +4,7 @@ [id="installing-odo-on-linux-on-ibm-z"] -= Installing {odo-title} on Linux on {ibmzProductName} and {linuxoneProductName} += Installing {odo-title} on Linux on {ibm-z-title} and {ibm-linuxone-title} == Binary installation diff --git a/modules/developer-cli-odo-installing-odo-on-linux.adoc b/modules/developer-cli-odo-installing-odo-on-linux.adoc index e152a5e564..241f64294f 100644 --- a/modules/developer-cli-odo-installing-odo-on-linux.adoc +++ b/modules/developer-cli-odo-installing-odo-on-linux.adoc @@ -13,8 +13,8 @@ The `{odo-title}` CLI is available to download as a binary and as a tarball for |=== |Operating System|Binary|Tarball |Linux|link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-amd64[odo-linux-amd64] |link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-amd64.tar.gz[odo-linux-amd64.tar.gz] -|Linux on {ibmpowerProductName}|link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-ppc64le[odo-linux-ppc64le] |link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-ppc64le.tar.gz[odo-linux-ppc64le.tar.gz] -|Linux on {ibmzProductName} and {linuxoneProductName}|link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-s390x[odo-linux-s390x] |link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-s390x.tar.gz[odo-linux-s390x.tar.gz] +|Linux on {ibm-power-name}|link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-ppc64le[odo-linux-ppc64le] |link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-ppc64le.tar.gz[odo-linux-ppc64le.tar.gz] +|Linux on {ibm-z-name} and {ibm-linuxone-name}|link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-s390x[odo-linux-s390x] |link:https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-s390x.tar.gz[odo-linux-s390x.tar.gz] |=== diff --git a/modules/distr-tracing-deploy-streaming.adoc b/modules/distr-tracing-deploy-streaming.adoc index 134172c720..6c48fe3cb7 100644 --- a/modules/distr-tracing-deploy-streaming.adoc +++ b/modules/distr-tracing-deploy-streaming.adoc @@ -18,7 +18,7 @@ The streaming strategy requires an additional Red Hat subscription for AMQ Strea [NOTE] ==== -The streaming deployment strategy is currently unsupported on {ibmzProductName}. +The streaming deployment strategy is currently unsupported on {ibm-z-name}. ==== .Prerequisites diff --git a/modules/dynamic-provisioning-available-plugins.adoc b/modules/dynamic-provisioning-available-plugins.adoc index 6db5dbc1a2..f7192daf9c 100644 --- a/modules/dynamic-provisioning-available-plugins.adoc +++ b/modules/dynamic-provisioning-available-plugins.adoc @@ -52,9 +52,9 @@ ifndef::openshift-rosa[] cluster per GCE project to avoid PVs from being created in zones where no node in the current cluster exists. -|{ibmpowerProductName} Virtual Server Block +|{ibm-power-server-name} Block |`powervs.csi.ibm.com` -|After installation, the IBM Power Virtual Server Block CSI Driver Operator and IBM Power Virtual Server Block CSI Driver automatically create the required storage classes for dynamic provisioning. +|After installation, the {ibm-power-server-name} Block CSI Driver Operator and {ibm-power-server-name} Block CSI Driver automatically create the required storage classes for dynamic provisioning. endif::openshift-rosa[] //|GlusterFS diff --git a/modules/ibm-z-choose-networking-setup.adoc b/modules/ibm-z-choose-networking-setup.adoc index f511d8e069..84644df467 100644 --- a/modules/ibm-z-choose-networking-setup.adoc +++ b/modules/ibm-z-choose-networking-setup.adoc @@ -6,7 +6,7 @@ [id="ibm-z-choose-networking-setup_{context}"] = Choose your networking setup -The networking stack is one of the most important components for a Kubernetes-based product like {product-title}. For {ibmzProductName} setups, the networking setup depends on the hypervisor of your choice. Depending on the workload and the application, the best fit usually changes with the use case and the traffic pattern. +The networking stack is one of the most important components for a Kubernetes-based product like {product-title}. For {ibm-z-name} setups, the networking setup depends on the hypervisor of your choice. Depending on the workload and the application, the best fit usually changes with the use case and the traffic pattern. Depending on your setup, consider these best practices: diff --git a/modules/ibm-z-ensure-high-disk-performance-hyperpav.adoc b/modules/ibm-z-ensure-high-disk-performance-hyperpav.adoc index 3d1c49c121..d27b86fab4 100644 --- a/modules/ibm-z-ensure-high-disk-performance-hyperpav.adoc +++ b/modules/ibm-z-ensure-high-disk-performance-hyperpav.adoc @@ -6,7 +6,7 @@ [id="ibm-z-ensure-high-disk-performance-hyperpav_{context}"] = Ensure high disk performance with HyperPAV on z/VM -DASD and ECKD devices are commonly used disk types in {ibmzProductName} environments. In a typical {product-title} setup in z/VM environments, DASD disks are commonly used to support the local storage for the nodes. You can set up HyperPAV alias devices to provide more throughput and overall better I/O performance for the DASD disks that support the z/VM guests. +DASD and ECKD devices are commonly used disk types in {ibm-z-name} environments. In a typical {product-title} setup in z/VM environments, DASD disks are commonly used to support the local storage for the nodes. You can set up HyperPAV alias devices to provide more throughput and overall better I/O performance for the DASD disks that support the z/VM guests. Using HyperPAV for the local storage devices leads to a significant performance benefit. However, you must be aware that there is a trade-off between throughput and CPU costs. diff --git a/modules/ibm-z-managing-cpu-overcommitment.adoc b/modules/ibm-z-managing-cpu-overcommitment.adoc index 706f5568d9..7f7da38e99 100644 --- a/modules/ibm-z-managing-cpu-overcommitment.adoc +++ b/modules/ibm-z-managing-cpu-overcommitment.adoc @@ -6,7 +6,7 @@ [id="ibm-z-managing-cpu-overcommitment_{context}"] = Managing CPU overcommitment -In a highly virtualized {ibmzProductName} environment, you must carefully plan the infrastructure setup and sizing. One of the most important features of virtualization is the capability to do resource overcommitment, allocating more resources to the virtual machines than actually available at the hypervisor level. This is very workload dependent and there is no golden rule that can be applied to all setups. +In a highly virtualized {ibm-z-name} environment, you must carefully plan the infrastructure setup and sizing. One of the most important features of virtualization is the capability to do resource overcommitment, allocating more resources to the virtual machines than actually available at the hypervisor level. This is very workload dependent and there is no golden rule that can be applied to all setups. Depending on your setup, consider these best practices regarding CPU overcommitment: diff --git a/modules/ibm-z-rhel-kvm-host-recommendations.adoc b/modules/ibm-z-rhel-kvm-host-recommendations.adoc index 19555a390c..5cfa512796 100644 --- a/modules/ibm-z-rhel-kvm-host-recommendations.adoc +++ b/modules/ibm-z-rhel-kvm-host-recommendations.adoc @@ -4,11 +4,11 @@ :_mod-docs-content-type: PROCEDURE [id="ibm-z-rhel-kvm-host-recommendations_{context}"] -= {op-system-base} KVM on {ibmzProductName} host recommendations += {op-system-base} KVM on {ibm-z-title} host recommendations Optimizing a KVM virtual server environment strongly depends on the workloads of the virtual servers and on the available resources. The same action that enhances performance in one environment can have adverse effects in another. Finding the best balance for a particular setting can be a challenge and often involves experimentation. -The following section introduces some best practices when using {product-title} with {op-system-base} KVM on {ibmzProductName} and {linuxoneProductName} environments. +The following section introduces some best practices when using {product-title} with {op-system-base} KVM on {ibm-z-name} and {ibm-linuxone-name} environments. [id="use-multiple-queues-for-your-virtio-network-interfaces_{context}"] == Use multiple queues for your VirtIO network interfaces diff --git a/modules/ibm-z-secure-execution.adoc b/modules/ibm-z-secure-execution.adoc index 40c6477d50..fb7aa6ccb4 100644 --- a/modules/ibm-z-secure-execution.adoc +++ b/modules/ibm-z-secure-execution.adoc @@ -5,35 +5,35 @@ :_mod-docs-content-type: PROCEDURE [id="installing-rhcos-using-ibm-secure-execution_{context}"] -= Installing {op-system} using IBM Secure Execution += Installing {op-system} using {ibm-title} Secure Execution -Before you install {op-system} using IBM Secure Execution, you must prepare the underlying infrastructure. +Before you install {op-system} using {ibm-name} Secure Execution, you must prepare the underlying infrastructure. .Prerequisites -* IBM z15 or later, or {linuxoneProductName} III or later. +* {ibm-name} z15 or later, or {ibm-linuxone-name} III or later. * {op-system-base-full} 8 or later. * You have a bootstrap Ignition file. The file is not protected, enabling others to view and edit it. * You have verified that the boot image has not been altered after installation. -* You must run all your nodes as IBM Secure Execution guests. +* You must run all your nodes as {ibm-name} Secure Execution guests. .Procedure -. Prepare your {op-system-base} KVM host to support IBM Secure Execution. +. Prepare your {op-system-base} KVM host to support {ibm-name} Secure Execution. -** By default, KVM hosts do not support guests in IBM Secure Execution mode. To support guests in IBM Secure Execution mode, KVM hosts must boot in LPAR mode with the kernel parameter specification `prot_virt=1`. To enable `prot_virt=1` on {op-system-base} 8, follow these steps: +** By default, KVM hosts do not support guests in {ibm-name} Secure Execution mode. To support guests in {ibm-name} Secure Execution mode, KVM hosts must boot in LPAR mode with the kernel parameter specification `prot_virt=1`. To enable `prot_virt=1` on {op-system-base} 8, follow these steps: .. Navigate to `/boot/loader/entries/` to modify your bootloader configuration file `*.conf`. .. Add the kernel command line parameter `prot_virt=1`. .. Run the `zipl` command and reboot your system. + -KVM hosts that successfully start with support for IBM Secure Execution for Linux issue the following kernel message: +KVM hosts that successfully start with support for {ibm-name} Secure Execution for Linux issue the following kernel message: + [source,terminal] ---- prot_virt: Reserving MB as ultravisor base storage. ---- -.. To verify that the KVM host now supports IBM Secure Execution, run the following command: +.. To verify that the KVM host now supports {ibm-name} Secure Execution, run the following command: + [source,terminal] ---- @@ -54,7 +54,7 @@ During the first boot, {op-system} looks for your host keys to re-encrypt itself + [NOTE] ==== -You need to prepare your Ignition file on a safe system. For example, another IBM Secure Execution guest. +You need to prepare your Ignition file on a safe system. For example, another {ibm-name} Secure Execution guest. ==== + For example: @@ -87,7 +87,7 @@ For example: + [NOTE] ==== -You can add as many host keys as required if you want your node to be able to run on multiple {ibmzProductName} machines. +You can add as many host keys as required if you want your node to be able to run on multiple {ibm-z-name} machines. ==== . To generate the Base64 encoded string, run the following command: + @@ -96,7 +96,7 @@ You can add as many host keys as required if you want your node to be able to ru base64 .crt ---- + -Compared to guests not running IBM Secure Execution, the first boot of the machine is longer because the entire image is encrypted with a randomly generated LUKS passphrase before the Ignition phase. +Compared to guests not running {ibm-name} Secure Execution, the first boot of the machine is longer because the entire image is encrypted with a randomly generated LUKS passphrase before the Ignition phase. . Add Ignition protection + @@ -104,7 +104,7 @@ To protect the secrets that are stored in the Ignition config file from being re + [NOTE] ==== -To achieve the desired security, Ignition logging and local login are disabled by default when running IBM Secure Execution. +To achieve the desired security, Ignition logging and local login are disabled by default when running {ibm-name} Secure Execution. ==== .. Fetch the public GPG key for the `secex-qemu.qcow2` image and encrypt the Ignition config with the key by running the following command: + @@ -143,4 +143,4 @@ Starting coreos-ignition-s…reOS Ignition User Config Setup... ---- + -. Follow the fast-track installation procedure to install nodes using the IBM Secure Exection QCOW image. \ No newline at end of file +. Follow the fast-track installation procedure to install nodes using the {ibm-name} Secure Exection QCOW image. \ No newline at end of file diff --git a/modules/ibmz-configure-devices-manually.adoc b/modules/ibmz-configure-devices-manually.adoc index 3e0bd0e94e..bc9ede9f69 100644 --- a/modules/ibmz-configure-devices-manually.adoc +++ b/modules/ibmz-configure-devices-manually.adoc @@ -6,7 +6,7 @@ [id="configure-additional-devices-manually_{context}"] = Configuring additional devices manually -Tasks in this section describe how to manually configure additional devices in an {ibmzProductName} or {linuxoneProductName} environment. This configuration method is persistent over node restarts but not {product-title} native and you need to redo the steps if you replace the node. +Tasks in this section describe how to manually configure additional devices in an {ibm-z-name} or {ibm-linuxone-name} environment. This configuration method is persistent over node restarts but not {product-title} native and you need to redo the steps if you replace the node. .Prerequisites diff --git a/modules/ibmz-configure-devices-mco.adoc b/modules/ibmz-configure-devices-mco.adoc index 85b2a5d0af..3e70ed0afc 100644 --- a/modules/ibmz-configure-devices-mco.adoc +++ b/modules/ibmz-configure-devices-mco.adoc @@ -6,7 +6,7 @@ [id="configure-additional-devices-using-mco_{context}"] = Configuring additional devices using the Machine Config Operator (MCO) -Tasks in this section describe how to use features of the Machine Config Operator (MCO) to configure additional devices in an {ibmzProductName} or {linuxoneProductName} environment. Configuring devices with the MCO is persistent but only allows specific configurations for compute nodes. MCO does not allow control plane nodes to have different configurations. +Tasks in this section describe how to use features of the Machine Config Operator (MCO) to configure additional devices in an {ibm-z-name} or {ibm-linuxone-name} environment. Configuring devices with the MCO is persistent but only allows specific configurations for compute nodes. MCO does not allow control plane nodes to have different configurations. .Prerequisites diff --git a/modules/ibmz-configure-nbde-with-static-ip.adoc b/modules/ibmz-configure-nbde-with-static-ip.adoc index 47988afb43..8f0999d9a5 100644 --- a/modules/ibmz-configure-nbde-with-static-ip.adoc +++ b/modules/ibmz-configure-nbde-with-static-ip.adoc @@ -20,9 +20,9 @@ endif::[] :_mod-docs-content-type: PROCEDURE [id="configuring-nbde-static-ip-ibmz-linuxone-environment_{context}"] -= Configuring NBDE with static IP in an {ibmzProductName} or {linuxoneProductName} environment += Configuring NBDE with static IP in an {ibm-z-title} or {ibm-linuxone-title} environment -Enabling NBDE disk encryption in an {ibmzProductName} or {linuxoneProductName} environment requires additional steps, which are described in detail in this section. +Enabling NBDE disk encryption in an {ibm-z-name} or {ibm-linuxone-name} environment requires additional steps, which are described in detail in this section. .Prerequisites diff --git a/modules/ibmz-enable-multipathing-fcp-luns.adoc b/modules/ibmz-enable-multipathing-fcp-luns.adoc index 5ba871d760..7caa877a24 100644 --- a/modules/ibmz-enable-multipathing-fcp-luns.adoc +++ b/modules/ibmz-enable-multipathing-fcp-luns.adoc @@ -6,11 +6,11 @@ [id="enabling-multipathing-fcp-luns_{context}"] = Enabling multipathing for FCP LUNs -Tasks in this section describe how to manually configure additional devices in an {ibmzProductName} or {linuxoneProductName} environment. This configuration method is persistent over node restarts but not {product-title} native and you need to redo the steps if you replace the node. +Tasks in this section describe how to manually configure additional devices in an {ibm-z-name} or {ibm-linuxone-name} environment. This configuration method is persistent over node restarts but not {product-title} native and you need to redo the steps if you replace the node. [IMPORTANT] ==== -On {ibmzProductName} and {linuxoneProductName}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}_. +On {ibm-z-name} and {ibm-linuxone-name}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}_. ==== .Prerequisites diff --git a/modules/install-ibm-cloud-configuring-the-install-config-file.adoc b/modules/install-ibm-cloud-configuring-the-install-config-file.adoc index 47feb57384..827c26064f 100644 --- a/modules/install-ibm-cloud-configuring-the-install-config-file.adoc +++ b/modules/install-ibm-cloud-configuring-the-install-config-file.adoc @@ -6,7 +6,7 @@ [id="configuring-the-install-config-file_{context}"] = Configuring the install-config.yaml file -The `install-config.yaml` file requires some additional details. Most of the information is teaching the installer and the resulting cluster enough about the available {ibm-cloud-bm-reg} hardware so that it is able to fully manage it. The material difference between installing on bare metal and installing on {ibm-cloud-bm-reg} is that you must explicitly set the privilege level for IPMI in the BMC section of the `install-config.yaml` file. +The `install-config.yaml` file requires some additional details. Most of the information is teaching the installer and the resulting cluster enough about the available {ibm-cloud-bm} hardware so that it is able to fully manage it. The material difference between installing on bare metal and installing on {ibm-cloud-bm} is that you must explicitly set the privilege level for IPMI in the BMC section of the `install-config.yaml` file. .Procedure diff --git a/modules/install-ibm-cloud-configuring-the-public-subnet.adoc b/modules/install-ibm-cloud-configuring-the-public-subnet.adoc index 7a632c2b54..338cac2ad8 100644 --- a/modules/install-ibm-cloud-configuring-the-public-subnet.adoc +++ b/modules/install-ibm-cloud-configuring-the-public-subnet.adoc @@ -6,7 +6,7 @@ [id="configuring-the-public-subnet_{context}"] = Configuring the public subnet -All of the {product-title} cluster nodes must be on the public subnet. {ibm-cloud-bm-reg} does not provide a DHCP server on the subnet. Set it up separately on the provisioner node. +All of the {product-title} cluster nodes must be on the public subnet. {ibm-cloud-bm} does not provide a DHCP server on the subnet. Set it up separately on the provisioner node. You must reset the BASH variables defined when preparing the provisioner node. Rebooting the provisioner node after preparing it will delete the BASH variables previously set. diff --git a/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc b/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc index 0f9f9cc3f1..3cb86f9c43 100644 --- a/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc +++ b/modules/install-ibm-cloud-setting-up-ibm-cloud-infrastructure.adoc @@ -1,23 +1,23 @@ // This is included in the following assemblies: // // installing_ibm_cloud/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-reg} infrastructure += Setting up {ibm-cloud-bm-title} infrastructure -To deploy an {product-title} cluster on {ibm-cloud-bm} infrastructure, you must first provision the IBM Cloud nodes. +To deploy an {product-title} cluster on {ibm-cloud-bm} infrastructure, you must first provision the {ibm-cloud-name} nodes. [IMPORTANT] ==== -Red Hat supports IPMI and PXE on the `provisioning` network only. Red Hat has not tested Red Fish, virtual media, or other complementary technologies such as Secure Boot on IBM Cloud deployments. The `provisioning` network is required. +Red Hat supports IPMI and PXE on the `provisioning` network only. Red Hat has not tested Red Fish, virtual media, or other complementary technologies such as Secure Boot on {ibm-cloud-name} deployments. The `provisioning` network is required. ==== -You can customize IBM Cloud nodes using the IBM Cloud API. When creating IBM Cloud nodes, you must consider the following requirements. +You can customize {ibm-cloud-name} nodes using the {ibm-cloud-name} API. When creating {ibm-cloud-name} nodes, you must consider the following requirements. [discrete] == Use one data center per cluster -All nodes in the {product-title} cluster must run in the same IBM Cloud data center. +All nodes in the {product-title} cluster must run in the same {ibm-cloud-name} data center. [discrete] == Create public and private VLANs @@ -27,9 +27,9 @@ Create all nodes with a single public VLAN and a single private VLAN. [discrete] == Ensure subnets have sufficient IP addresses -IBM Cloud public VLAN subnets use a `/28` prefix by default, which provides 16 IP addresses. That is sufficient for a cluster consisting of three control plane nodes, four worker nodes, and two IP addresses for the API VIP and Ingress VIP on the `baremetal` network. For larger clusters, you might need a smaller prefix. +{ibm-cloud-name} public VLAN subnets use a `/28` prefix by default, which provides 16 IP addresses. That is sufficient for a cluster consisting of three control plane nodes, four worker nodes, and two IP addresses for the API VIP and Ingress VIP on the `baremetal` network. For larger clusters, you might need a smaller prefix. -IBM Cloud private VLAN subnets use a `/26` prefix by default, which provides 64 IP addresses. {ibm-cloud-bm} uses private network IP addresses to access the Baseboard Management Controller (BMC) of each node. {product-title} creates an additional subnet for the `provisioning` network. Network traffic for the `provisioning` network subnet routes through the private VLAN. For larger clusters, you might need a smaller prefix. +{ibm-cloud-name} private VLAN subnets use a `/26` prefix by default, which provides 64 IP addresses. {ibm-cloud-bm} uses private network IP addresses to access the Baseboard Management Controller (BMC) of each node. {product-title} creates an additional subnet for the `provisioning` network. Network traffic for the `provisioning` network subnet routes through the private VLAN. For larger clusters, you might need a smaller prefix. .IP addresses per prefix [options="header"] @@ -76,7 +76,7 @@ Ensure PXE is enabled on the NIC used for the `provisioning` network and is disa [discrete] == Configuring canonical names -Clients access the {product-title} cluster nodes over the `baremetal` network. Configure IBM Cloud subdomains or subzones where the canonical name extension is the cluster name. +Clients access the {product-title} cluster nodes over the `baremetal` network. Configure {ibm-cloud-name} subdomains or subzones where the canonical name extension is the cluster name. ---- . @@ -122,7 +122,7 @@ The following table provides an example of fully qualified domain names. The API [IMPORTANT] ==== -After provisioning the IBM Cloud nodes, you must create a DNS entry for the `api..` domain name on the external DNS because removing CoreDNS causes the local entry to disappear. Failure to create a DNS record for the `api..` domain name in the external DNS server prevents worker nodes from joining the cluster. +After provisioning the {ibm-cloud-name} nodes, you must create a DNS entry for the `api..` domain name on the external DNS because removing CoreDNS causes the local entry to disappear. Failure to create a DNS record for the `api..` domain name in the external DNS server prevents worker nodes from joining the cluster. ==== [discrete] @@ -138,7 +138,7 @@ Define a consistent clock date and time format in each cluster node's BIOS setti [discrete] == Configure a DHCP server -{ibm-cloud-bm} does not run DHCP on the public or private VLANs. After provisioning IBM Cloud nodes, you must set up a DHCP server for the public VLAN, which corresponds to {product-title}'s `baremetal` network. +{ibm-cloud-bm} does not run DHCP on the public or private VLANs. After provisioning {ibm-cloud-name} nodes, you must set up a DHCP server for the public VLAN, which corresponds to {product-title}'s `baremetal` network. [NOTE] ==== @@ -159,12 +159,12 @@ In the `install-config.yaml` file, add the `privilegelevel` parameter to the URL ipmi://:?privilegelevel=OPERATOR ---- -Alternatively, contact IBM Cloud support and request that they increase the IPMI privileges to `ADMINISTRATOR` for each node. +Alternatively, contact {ibm-cloud-name} support and request that they increase the IPMI privileges to `ADMINISTRATOR` for each node. [discrete] == Create bare metal servers -Create bare metal servers in the link:https://cloud.ibm.com[IBM Cloud dashboard] by navigating to *Create resource* -> *Bare Metal Servers for Classic*. +Create bare metal servers in the link:https://cloud.ibm.com[{ibm-cloud-name} dashboard] by navigating to *Create resource* -> *Bare Metal Servers for Classic*. Alternatively, you can create bare metal servers with the `ibmcloud` CLI utility. For example: @@ -179,9 +179,9 @@ $ ibmcloud sl hardware create --hostname \ --billing ---- -See link:https://cloud.ibm.com/docs/cli?topic=cli-install-ibmcloud-cli[Installing the stand-alone IBM Cloud CLI] for details on installing the IBM Cloud CLI. +See link:https://cloud.ibm.com/docs/cli?topic=cli-install-ibmcloud-cli[Installing the stand-alone {ibm-cloud-name} CLI] for details on installing the {ibm-cloud-name} CLI. [NOTE] ==== -IBM Cloud servers might take 3-5 hours to become available. +{ibm-cloud-name} servers might take 3-5 hours to become available. ==== diff --git a/modules/install-sno-ibm-power.adoc b/modules/install-sno-ibm-power.adoc index de4cbaabf9..770448878e 100644 --- a/modules/install-sno-ibm-power.adoc +++ b/modules/install-sno-ibm-power.adoc @@ -4,7 +4,7 @@ :_mod-docs-content-type: PROCEDURE [id="installing-sno-on-ibm-power_{context}"] -= Installing {sno} with {ibmpowerProductName} += Installing {sno} with {ibm-power-title} .Prerequisites diff --git a/modules/install-sno-ibm-z-kvm.adoc b/modules/install-sno-ibm-z-kvm.adoc index 04aa87cfd7..02e4e05590 100644 --- a/modules/install-sno-ibm-z-kvm.adoc +++ b/modules/install-sno-ibm-z-kvm.adoc @@ -4,7 +4,7 @@ :_mod-docs-content-type: PROCEDURE [id="installing-sno-on-ibm-z-kvm_{context}"] -= Installing {sno} with {op-system-base} KVM on {ibmzProductName} and {linuxoneProductName} += Installing {sno} with {op-system-base} KVM on {ibm-z-title} and {ibm-linuxone-title} .Prerequisites diff --git a/modules/install-sno-ibm-z.adoc b/modules/install-sno-ibm-z.adoc index 68357a7eaf..cd997227b8 100644 --- a/modules/install-sno-ibm-z.adoc +++ b/modules/install-sno-ibm-z.adoc @@ -4,7 +4,7 @@ :_mod-docs-content-type: PROCEDURE [id="installing-sno-on-ibm-z_{context}"] -= Installing {sno} with z/VM on {ibmzProductName} and {linuxoneProductName} += Installing {sno} with z/VM on {ibm-z-title} and {ibm-linuxone-title} .Prerequisites @@ -165,7 +165,7 @@ console=tty1 console=ttyS1,115200n8 ---- <1> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported. <2> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported. -<3> For the `ip=` parameter, assign the IP address automatically using DHCP or manually as described in "Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}". +<3> For the `ip=` parameter, assign the IP address automatically using DHCP or manually as described in "Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}". <4> For installations on DASD-type disks, use `rd.dasd=` to specify the DASD where {op-system} is to be installed. Omit this entry for FCP-type disks. <5> For installations on FCP-type disks, use `rd.zfcp=,,` to specify the FCP disk where {op-system} is to be installed. Omit this entry for DASD-type disks. + diff --git a/modules/install-sno-requirements-for-installing-on-a-single-node.adoc b/modules/install-sno-requirements-for-installing-on-a-single-node.adoc index 584b62fbf6..3862e2d42f 100644 --- a/modules/install-sno-requirements-for-installing-on-a-single-node.adoc +++ b/modules/install-sno-requirements-for-installing-on-a-single-node.adoc @@ -16,12 +16,12 @@ For the `ppc64le` platform, the host should prepare the ISO, but does not need t [NOTE] ==== -ISO is not required for {ibmzProductName} installations. +ISO is not required for {ibm-z-name} installations. ==== * *CPU Architecture:* Installing {product-title} on a single node supports `x86_64`, `arm64`,`ppc64le`, and `s390x` CPU architectures. -* *Supported platforms:* Installing {product-title} on a single node is supported on bare metal, vSphere, AWS, Red Hat OpenStack, {VirtProductName}, {ibmpowerProductName}, and {ibmzProductName} platforms. +* *Supported platforms:* Installing {product-title} on a single node is supported on bare metal, vSphere, AWS, Red Hat OpenStack, {VirtProductName}, {ibm-power-name}, and {ibm-z-name} platforms. * *Production-grade server:* Installing {product-title} on a single node requires a server with sufficient resources to run {product-title} services and a production workload. + @@ -45,7 +45,7 @@ The server must have a Baseboard Management Controller (BMC) when booting with v [NOTE] ==== -BMC is not supported on {ibmzProductName} and {ibmpowerProductName}. +BMC is not supported on {ibm-z-name} and {ibm-power-name}. ==== * *Networking:* The server must have access to the internet or access to a local registry if it is not connected to a routable network. The server must have a DHCP reservation or a static IP address for the Kubernetes API, ingress route, and cluster node domain names. You must configure the DNS to resolve the IP address to each of the following fully qualified domain names (FQDN): diff --git a/modules/installation-bare-metal-config-yaml.adoc b/modules/installation-bare-metal-config-yaml.adoc index b238983107..a8d6c6d1c1 100644 --- a/modules/installation-bare-metal-config-yaml.adoc +++ b/modules/installation-bare-metal-config-yaml.adoc @@ -47,10 +47,10 @@ ifndef::ibm-z,ibm-z-kvm,ibm-power,agnostic[] = Sample install-config.yaml file for bare metal endif::ibm-z,ibm-z-kvm,ibm-power,agnostic[] ifdef::ibm-z,ibm-z-kvm[] -= Sample install-config.yaml file for {ibmzProductName} += Sample install-config.yaml file for {ibm-z-title} endif::ibm-z,ibm-z-kvm[] ifdef::ibm-power[] -= Sample install-config.yaml file for {ibmpowerProductName} += Sample install-config.yaml file for {ibm-power-title} endif::ibm-power[] ifdef::agnostic[] = Sample install-config.yaml file for other platforms @@ -243,8 +243,8 @@ Class E CIDR range is reserved for a future use. To use the Class E CIDR range, <10> The IP address pool to use for service IP addresses. You can enter only one IP address pool. This block must not overlap with existing physical networks. If you need to access the services from an external network, configure load balancers and routers to manage the traffic. <11> You must set the platform to `none`. You cannot provide additional platform configuration variables for ifndef::ibm-z,ibm-z-kvm,ibm-power[your platform.] -ifdef::ibm-z,ibm-z-kvm[{ibmzProductName} infrastructure.] -ifdef::ibm-power[{ibmpowerProductName} infrastructure.] +ifdef::ibm-z,ibm-z-kvm[{ibm-z-name} infrastructure.] +ifdef::ibm-power[{ibm-power-name} infrastructure.] + [IMPORTANT] ==== diff --git a/modules/installation-cis-ibm-cloud.adoc b/modules/installation-cis-ibm-cloud.adoc index ee498821bd..3dcad4d16c 100644 --- a/modules/installation-cis-ibm-cloud.adoc +++ b/modules/installation-cis-ibm-cloud.adoc @@ -9,9 +9,9 @@ endif::[] :_mod-docs-content-type: PROCEDURE [id="installation-cis-ibm-cloud_{context}"] -= Using IBM Cloud Internet Services for DNS resolution += Using {ibm-cloud-title} Internet Services for DNS resolution -The installation program uses IBM Cloud Internet Services (CIS) to configure cluster DNS resolution and provide name lookup for a public cluster. +The installation program uses {ibm-cloud-name} Internet Services (CIS) to configure cluster DNS resolution and provide name lookup for a public cluster. [NOTE] ==== @@ -22,8 +22,8 @@ You must create a domain zone in CIS in the same account as your cluster. You mu .Prerequisites -* You have installed the link:https://www.ibm.com/cloud/cli[IBM Cloud CLI]. -* You have an existing domain and registrar. For more information, see the IBM link:https://cloud.ibm.com/docs/dns?topic=dns-getting-started[documentation]. +* You have installed the link:https://www.ibm.com/cloud/cli[{ibm-cloud-name} CLI]. +* You have an existing domain and registrar. For more information, see the {ibm-name} link:https://cloud.ibm.com/docs/dns?topic=dns-getting-started[documentation]. .Procedure @@ -37,7 +37,7 @@ $ ibmcloud plugin install cis ---- ifdef::ibm-power-vs[] -.. Log in to IBM Cloud by using the CLI: +.. Log in to {ibm-cloud-name} by using the CLI: + [source,terminal] ---- @@ -89,7 +89,7 @@ A root domain uses the form `openshiftcorp.com`. A subdomain uses the form `clus . Open the link:https://cloud.ibm.com/catalog/services/internet-services[CIS web console], navigate to the *Overview* page, and note your CIS name servers. These name servers will be used in the next step. -. Configure the name servers for your domains or subdomains at the domain's registrar or DNS provider. For more information, see the IBM Cloud link:https://cloud.ibm.com/docs/cis?topic=cis-getting-started#configure-your-name-servers-with-the-registrar-or-existing-dns-provider[documentation]. +. Configure the name servers for your domains or subdomains at the domain's registrar or DNS provider. For more information, see the {ibm-cloud-name} link:https://cloud.ibm.com/docs/cis?topic=cis-getting-started#configure-your-name-servers-with-the-registrar-or-existing-dns-provider[documentation]. ifeval::["{context}" == "installing-ibm-cloud-account-power-vs"] :!ibm-power-vs: diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 8d92028b62..3f201d741f 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -128,31 +128,31 @@ ifdef::ibm-power-vs[] |platform: powervs: userID: -|The UserID is the login for the user's IBM Cloud account. +|The UserID is the login for the user's {ibm-cloud-name} account. |String. For example, `existing_user_id`. |platform: powervs: powervsResourceGroup: -|The PowerVSResourceGroup is the resource group in which {ibmpowerProductName} Virtual Server resources are created. If using an existing VPC, the existing VPC and subnets should be in this resource group. +|The PowerVSResourceGroup is the resource group in which {ibm-power-server-name} resources are created. If using an existing VPC, the existing VPC and subnets should be in this resource group. |String. For example, `existing_resource_group`. |platform: powervs: region: -|Specifies the IBM Cloud colo region where the cluster will be created. +|Specifies the {ibm-cloud-name} colo region where the cluster will be created. |String. For example, `existing_region`. |platform: powervs: zone: -|Specifies the IBM Cloud colo region where the cluster will be created. +|Specifies the {ibm-cloud-name} colo region where the cluster will be created. |String. For example, `existing_zone`. |platform: powervs: serviceInstanceID: -|The ServiceInstanceID is the ID of the Power IAAS instance created from the IBM Cloud Catalog. +|The ServiceInstanceID is the ID of the Power IAAS instance created from the {ibm-cloud-name} Catalog. |String. For example, `existing_service_instance_ID`. endif::ibm-power-vs[] |==== @@ -179,7 +179,7 @@ ifdef::bare,ibm-power,ibm-z,vsphere[] ifdef::ibm-cloud[] [NOTE] ==== -IBM Cloud VPC does not support IPv6 address families. +{ibm-cloud-name} does not support IPv6 address families. ==== endif::ibm-cloud[] @@ -365,7 +365,7 @@ networking: machineNetwork: cidr: | -Required if you use `networking.machineNetwork`. An IP address block. The default value is `10.0.0.0/16` for all platforms other than libvirt and {ibmpowerProductName} Virtual Server. For libvirt, the default value is `192.168.126.0/24`. For {ibmpowerProductName} Virtual Server, the default value is `192.168.0.0/24`. +Required if you use `networking.machineNetwork`. An IP address block. The default value is `10.0.0.0/16` for all platforms other than libvirt and {ibm-power-server-name}. For libvirt, the default value is `192.168.126.0/24`. For {ibm-power-server-name}, the default value is `192.168.0.0/24`. ifdef::ibm-cloud[] If you are deploying the cluster to an existing Virtual Private Cloud (VPC), the CIDR must contain the subnets defined in `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`. endif::ibm-cloud[] @@ -649,7 +649,7 @@ ifdef::ibm-power-vs[] |platform: powervs: vpcRegion: -|Specifies the IBM Cloud region in which to create VPC resources. +|Specifies the {ibm-cloud-name} region in which to create VPC resources. |String. For example, `existing_vpc_region`. |platform: @@ -661,7 +661,7 @@ ifdef::ibm-power-vs[] |platform: powervs: vpcName: -|Specifies the IBM Cloud VPC name. +|Specifies the {ibm-cloud-name} name. |String. For example, `existing_vpcName`. |platform: @@ -673,13 +673,13 @@ ifdef::ibm-power-vs[] |platform: powervs: clusterOSImage: -|The ClusterOSImage is a pre-created {ibmpowerProductName} Virtual Server boot image that overrides the default image for cluster nodes. +|The ClusterOSImage is a pre-created {ibm-power-server-name} boot image that overrides the default image for cluster nodes. |String. For example, `existing_cluster_os_image`. |platform: powervs: defaultMachinePlatform: -|The DefaultMachinePlatform is the default configuration used when installing on {ibmpowerProductName} Virtual Server for machine pools that do not define their own platform configuration. +|The DefaultMachinePlatform is the default configuration used when installing on {ibm-power-server-name} for machine pools that do not define their own platform configuration. |String. For example, `existing_machine_platform`. |platform: @@ -1816,11 +1816,11 @@ When running your cluster on GCP 64-bit ARM infrastructures, ensure that you use endif::gcp[] ifdef::ibm-cloud[] [id="installation-configuration-parameters-additional-ibm-cloud_{context}"] -== Additional IBM Cloud VPC configuration parameters +== Additional {ibm-cloud-title} configuration parameters -Additional IBM Cloud VPC configuration parameters are described in the following table: +Additional {ibm-cloud-name} configuration parameters are described in the following table: -.Additional IBM Cloud VPC parameters +.Additional {ibm-cloud-name} parameters [cols=".^1,.^6a,.^3a",options="header"] |==== |Parameter|Description|Values @@ -1838,15 +1838,15 @@ In either case, this resource group must only be used for a single cluster insta |`platform.ibmcloud.dedicatedHosts.profile` |The new dedicated host to create. If you specify a value for `platform.ibmcloud.dedicatedHosts.name`, this parameter is not required. -|Valid IBM Cloud VPC dedicated host profile, such as `cx2-host-152x304`. [^2^] +|Valid {ibm-cloud-name} dedicated host profile, such as `cx2-host-152x304`. [^2^] |`platform.ibmcloud.dedicatedHosts.name` |An existing dedicated host. If you specify a value for `platform.ibmcloud.dedicatedHosts.profile`, this parameter is not required. |String, for example `my-dedicated-host-name`. |`platform.ibmcloud.type` -|The instance type for all IBM Cloud VPC machines. -|Valid IBM Cloud VPC instance type, such as `bx2-8x32`. [^2^] +|The instance type for all {ibm-cloud-name} machines. +|Valid {ibm-cloud-name} instance type, such as `bx2-8x32`. [^2^] |`platform.ibmcloud.vpcName` | The name of the existing VPC that you want to deploy your cluster to. @@ -1864,7 +1864,7 @@ In either case, this resource group must only be used for a single cluster insta [.small] -- 1. Whether you define an existing resource group, or if the installer creates one, determines how the resource group is treated when the cluster is uninstalled. If you define a resource group, the installer removes all of the installer-provisioned resources, but leaves the resource group alone; if a resource group is created as part of the installation, the installer removes all of the installer-provisioned resources and the resource group. -2. To determine which profile best meets your needs, see https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui[Instance Profiles] in the IBM documentation. +2. To determine which profile best meets your needs, see https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui[Instance Profiles] in the {ibm-name} documentation. -- endif::ibm-cloud[] diff --git a/modules/installation-custom-ibm-cloud-vpc.adoc b/modules/installation-custom-ibm-cloud-vpc.adoc index 899bbcf134..c8a67a3f89 100644 --- a/modules/installation-custom-ibm-cloud-vpc.adoc +++ b/modules/installation-custom-ibm-cloud-vpc.adoc @@ -7,7 +7,7 @@ [id="installation-custom-ibm-cloud-vpc_{context}"] = About using a custom VPC -In {product-title} {product-version}, you can deploy a cluster into the subnets of an existing IBM Virtual Private Cloud (VPC). Deploying {product-title} into an existing VPC can help you avoid limit constraints in new accounts or more easily abide by the operational constraints that your company's guidelines set. If you cannot obtain the infrastructure creation permissions that are required to create the VPC yourself, use this installation option. +In {product-title} {product-version}, you can deploy a cluster into the subnets of an existing {ibm-name} Virtual Private Cloud (VPC). Deploying {product-title} into an existing VPC can help you avoid limit constraints in new accounts or more easily abide by the operational constraints that your company's guidelines set. If you cannot obtain the infrastructure creation permissions that are required to create the VPC yourself, use this installation option. Because the installation program cannot know what other components are in your existing subnets, it cannot choose subnet CIDRs and so forth. You must configure networking for the subnets to which you will install the cluster. diff --git a/modules/installation-custom-ibm-power-vs.adoc b/modules/installation-custom-ibm-power-vs.adoc index bb2fc2085b..27900f4985 100644 --- a/modules/installation-custom-ibm-power-vs.adoc +++ b/modules/installation-custom-ibm-power-vs.adoc @@ -20,12 +20,12 @@ ifndef::private[] = About using a custom VPC ifdef::ibm-powervs-vpc[] -In {product-title} {product-version}, you can deploy a cluster using an existing IBM Virtual Private Cloud (VPC). +In {product-title} {product-version}, you can deploy a cluster using an existing {ibm-name} Virtual Private Cloud (VPC). Because the installation program cannot know what other components are in your existing subnets, it cannot choose subnet CIDRs and so forth. You must configure networking for the subnets to which you will install the cluster. endif::ibm-powervs-vpc[] ifdef::restricted[] -In {product-title} {product-version}, you can deploy a cluster into the subnets of an existing IBM Virtual Private Cloud (VPC). +In {product-title} {product-version}, you can deploy a cluster into the subnets of an existing {ibm-name} Virtual Private Cloud (VPC). endif::restricted[] endif::private[] diff --git a/modules/installation-dns-ibm-cloud.adoc b/modules/installation-dns-ibm-cloud.adoc index 92da5c6fd9..de522d80e7 100644 --- a/modules/installation-dns-ibm-cloud.adoc +++ b/modules/installation-dns-ibm-cloud.adoc @@ -4,21 +4,21 @@ :_mod-docs-content-type: PROCEDURE [id="installation-dns-ibm-cloud_{context}"] -= Using IBM Cloud DNS Services for DNS resolution += Using {ibm-cloud-title} DNS Services for DNS resolution -The installation program uses IBM Cloud DNS Services to configure cluster DNS resolution and provide name lookup for a private cluster. +The installation program uses {ibm-cloud-name} DNS Services to configure cluster DNS resolution and provide name lookup for a private cluster. You configure DNS resolution by creating a DNS services instance for the cluster, and then adding a DNS zone to the DNS Services instance. Ensure that the zone is authoritative for the domain. You can do this using a root domain or subdomain. [NOTE] ==== -IBM Cloud VPC does not support IPv6, so dual stack or IPv6 environments are not possible. +{ibm-cloud-name} does not support IPv6, so dual stack or IPv6 environments are not possible. ==== .Prerequisites -* You have installed the link:https://www.ibm.com/cloud/cli[IBM Cloud CLI]. -* You have an existing domain and registrar. For more information, see the IBM link:https://cloud.ibm.com/docs/dns?topic=dns-getting-started[documentation]. +* You have installed the link:https://www.ibm.com/cloud/cli[{ibm-cloud-name} CLI]. +* You have an existing domain and registrar. For more information, see the {ibm-name} link:https://cloud.ibm.com/docs/dns?topic=dns-getting-started[documentation]. .Procedure diff --git a/modules/installation-ibm-cloud-config-yaml.adoc b/modules/installation-ibm-cloud-config-yaml.adoc index 95373ef4b1..e6e36eb9fc 100644 --- a/modules/installation-ibm-cloud-config-yaml.adoc +++ b/modules/installation-ibm-cloud-config-yaml.adoc @@ -20,7 +20,7 @@ endif::[] :_mod-docs-content-type: REFERENCE [id="installation-ibm-cloud-config-yaml_{context}"] -= Sample customized install-config.yaml file for IBM Cloud VPC += Sample customized install-config.yaml file for {ibm-cloud-title} You can customize the `install-config.yaml` file to specify more details about your {product-title} cluster's platform or modify the values of the required parameters. diff --git a/modules/installation-ibm-cloud-creating-api-key.adoc b/modules/installation-ibm-cloud-creating-api-key.adoc index 443884a3fc..9c2d9106e6 100644 --- a/modules/installation-ibm-cloud-creating-api-key.adoc +++ b/modules/installation-ibm-cloud-creating-api-key.adoc @@ -7,15 +7,15 @@ [id="installation-ibm-cloud-creating-api-key_{context}"] = Creating an API key -You must create a user API key or a service ID API key for your IBM Cloud account. +You must create a user API key or a service ID API key for your {ibm-cloud-name} account. .Prerequisites -* You have assigned the required access policies to your IBM Cloud account. +* You have assigned the required access policies to your {ibm-cloud-name} account. * You have attached you IAM access policies to an access group, or other appropriate resource. .Procedure * Create an API key, depending on how you defined your IAM access policies. + -For example, if you assigned your access policies to a user, you must create a link:https://cloud.ibm.com/docs/account?topic=account-userapikey[user API key]. If you assigned your access policies to a service ID, you must create a link:https://cloud.ibm.com/docs/account?topic=account-serviceidapikeys[service ID API key]. If your access policies are assigned to an access group, you can use either API key type. For more information on IBM Cloud VPC API keys, see link:https://cloud.ibm.com/docs/account?topic=account-manapikey&interface=ui[Understanding API keys]. +For example, if you assigned your access policies to a user, you must create a link:https://cloud.ibm.com/docs/account?topic=account-userapikey[user API key]. If you assigned your access policies to a service ID, you must create a link:https://cloud.ibm.com/docs/account?topic=account-serviceidapikeys[service ID API key]. If your access policies are assigned to an access group, you can use either API key type. For more information on {ibm-cloud-name} API keys, see link:https://cloud.ibm.com/docs/account?topic=account-manapikey&interface=ui[Understanding API keys]. diff --git a/modules/installation-ibm-cloud-export-variables.adoc b/modules/installation-ibm-cloud-export-variables.adoc index bc8d319de4..46fb18ad9c 100644 --- a/modules/installation-ibm-cloud-export-variables.adoc +++ b/modules/installation-ibm-cloud-export-variables.adoc @@ -42,7 +42,7 @@ You must set the API key you created as a global variable; the installation prog .Prerequisites -* You have created either a user API key or service ID API key for your IBM Cloud account. +* You have created either a user API key or service ID API key for your {ibm-cloud-name} account. .Procedure diff --git a/modules/installation-ibm-cloud-iam-policies-api-key.adoc b/modules/installation-ibm-cloud-iam-policies-api-key.adoc index 2d94ff3f01..b537bba3ce 100644 --- a/modules/installation-ibm-cloud-iam-policies-api-key.adoc +++ b/modules/installation-ibm-cloud-iam-policies-api-key.adoc @@ -12,17 +12,17 @@ endif::[] :_mod-docs-content-type: CONCEPT [id="installation-ibm-cloud-iam-policies-api-key_{context}"] -= IBM Cloud VPC IAM Policies and API Key += {ibm-cloud-title} IAM Policies and API Key -To install {product-title} into your IBM Cloud account, the installation program requires an IAM API key, which provides authentication and authorization to access IBM Cloud service APIs. You can use an existing IAM API key that contains the required policies or create a new one. +To install {product-title} into your {ibm-cloud-name} account, the installation program requires an IAM API key, which provides authentication and authorization to access {ibm-cloud-name} service APIs. You can use an existing IAM API key that contains the required policies or create a new one. -For an IBM Cloud IAM overview, see the IBM Cloud link:https://cloud.ibm.com/docs/account?topic=account-iamoverview[documentation]. +For an {ibm-cloud-name} IAM overview, see the {ibm-cloud-name} link:https://cloud.ibm.com/docs/account?topic=account-iamoverview[documentation]. ifdef::ibm-vpc[] [id="required-access-policies-ibm-cloud_{context}"] == Required access policies -You must assign the required access policies to your IBM Cloud account. +You must assign the required access policies to your {ibm-cloud-name} account. .Required access policies [cols="1,2,2,2,3",options="header"] @@ -75,7 +75,7 @@ You must assign the required access policies to your IBM Cloud account. [.small] -- 1. The policy access scope should be set based on how granular you want to assign access. The scope can be set to *All resources* or *Resources based on selected attributes*. -2. Optional: This access policy is only required if you want the installation program to create a resource group. For more information about resource groups, see the IBM link:https://cloud.ibm.com/docs/account?topic=account-rgs[documentation]. +2. Optional: This access policy is only required if you want the installation program to create a resource group. For more information about resource groups, see the {ibm-name} link:https://cloud.ibm.com/docs/account?topic=account-rgs[documentation]. -- //TODO: IBM confirmed current values in the table above. They hope to provide more guidance on possibly scoping down the permissions (related to resource group actions). endif::ibm-vpc[] @@ -126,7 +126,7 @@ ifdef::ibm-power-vs[] |Default resource group: The resource type should equal `Resource group`, with a value of `Default`. If your account administrator changed your account's default resource group to something other than Default, use that value instead. |Viewer, Operator, Editor, Reader, Manager -|Power Systems Virtual Server service in resource group +|{ibm-power-server-name} service in resource group |Viewer, Operator, Editor, Reader, Writer, Manager, Administrator |Internet Services service in resource group: CIS functional scope string equals reliability @@ -143,10 +143,10 @@ endif::ibm-power-vs[] == Access policy assignment ifdef::ibm-vpc[] -In IBM Cloud VPC IAM, access policies can be attached to different subjects: +In {ibm-cloud-name} IAM, access policies can be attached to different subjects: endif::ibm-vpc[] ifdef::ibm-power-vs[] -In IBM Cloud IAM, access policies can be attached to different subjects: +In {ibm-cloud-name} IAM, access policies can be attached to different subjects: endif::ibm-power-vs[] * Access group (Recommended) diff --git a/modules/installation-ibm-cloud-regions.adoc b/modules/installation-ibm-cloud-regions.adoc index 7d7178cbdc..d9b9b38021 100644 --- a/modules/installation-ibm-cloud-regions.adoc +++ b/modules/installation-ibm-cloud-regions.adoc @@ -13,11 +13,11 @@ endif::[] :_mod-docs-content-type: REFERENCE ifdef::ibm-vpc[] [id="installation-ibm-cloud-regions_{context}"] -= Supported IBM Cloud VPC regions += Supported {ibm-cloud-title} regions endif::ibm-vpc[] ifdef::ibm-power-vs[] [id="installation-ibm-power-vs-regions_{context}"] -= Supported {ibmpowerProductName} Virtual Server regions and zones += Supported {ibm-power-server-title} regions and zones endif::ibm-power-vs[] You can deploy an {product-title} cluster to the following regions: @@ -59,7 +59,7 @@ ifdef::ibm-power-vs[] * `tor` (Toronto, Canada) ** `tor01` -You might optionally specify the IBM Cloud VPC region in which the installer will create any VPC components. Supported regions in IBM Cloud are: +You might optionally specify the {ibm-cloud-name} region in which the installer will create any VPC components. Supported regions in {ibm-cloud-name} are: * `us-south` * `eu-de` diff --git a/modules/installation-ibm-power-vs-config-yaml.adoc b/modules/installation-ibm-power-vs-config-yaml.adoc index 670bd0340c..372e847dc0 100644 --- a/modules/installation-ibm-power-vs-config-yaml.adoc +++ b/modules/installation-ibm-power-vs-config-yaml.adoc @@ -20,7 +20,7 @@ endif::[] :_mod-docs-content-type: REFERENCE [id="installation-ibm-power-vs-config-yaml_{context}"] -= Sample customized install-config.yaml file for {ibmpowerProductName} Virtual Server += Sample customized install-config.yaml file for {ibm-power-server-title} You can customize the `install-config.yaml` file to specify more details about your {product-title} cluster's platform or modify the values of the required parameters. diff --git a/modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc b/modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc index a1a2abcf1b..8b3273ddf0 100644 --- a/modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc +++ b/modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc @@ -7,8 +7,8 @@ [id="installation-ibm-z-kvm-user-infra-installing-rhcos_{context}"] = Installing {op-system} and starting the {product-title} bootstrap process -To install {product-title} on {ibmzProductName} infrastructure that you provision, you must install {op-system-first} as {op-system-base-full} guest virtual machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. +To install {product-title} on {ibm-z-name} infrastructure that you provision, you must install {op-system-first} as {op-system-base-full} guest virtual machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted. You can perform a fast-track installation of {op-system} that uses a prepackaged QEMU copy-on-write (QCOW2) disk image. Alternatively, you can perform a full installation on a new QCOW2 disk image. -To add further security to your system, you can optionally install {op-system} using IBM Secure Execution before proceeding to the fast-track installation. +To add further security to your system, you can optionally install {op-system} using {ibm-name} Secure Execution before proceeding to the fast-track installation. diff --git a/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc b/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc index 83fba9db84..bdfa80c81e 100644 --- a/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc +++ b/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc @@ -56,4 +56,4 @@ $ virt-install --noautoconsole \ --network network={network},mac={mac} \ --disk path={ign_file},format=raw,readonly=on,serial=ignition,startup_policy=optional <1> ---- -<1> If IBM Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`. +<1> If {ibm-name} Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`. diff --git a/modules/installation-ibm-z-troubleshooting-and-debugging.adoc b/modules/installation-ibm-z-troubleshooting-and-debugging.adoc index 1f7bc4e901..4f8be08b07 100644 --- a/modules/installation-ibm-z-troubleshooting-and-debugging.adoc +++ b/modules/installation-ibm-z-troubleshooting-and-debugging.adoc @@ -7,7 +7,7 @@ = Collecting debugging information You can gather debugging information that might help you to troubleshoot and -debug certain issues with an {product-title} installation on {ibmzProductName}. +debug certain issues with an {product-title} installation on {ibm-z-name}. .Prerequisites diff --git a/modules/installation-ibm-z-user-infra-machines-iso.adoc b/modules/installation-ibm-z-user-infra-machines-iso.adoc index afbe56813b..8324826f24 100644 --- a/modules/installation-ibm-z-user-infra-machines-iso.adoc +++ b/modules/installation-ibm-z-user-infra-machines-iso.adoc @@ -6,7 +6,7 @@ [id="installation-user-infra-machines-iso-ibm-z_{context}"] = Installing {op-system} and starting the {product-title} bootstrap process -To install {product-title} on {ibmzProductName} infrastructure that you provision, you must install {op-system-first} on z/VM guest virtual machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} z/VM guest virtual machines have rebooted. +To install {product-title} on {ibm-z-name} infrastructure that you provision, you must install {op-system-first} on z/VM guest virtual machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} z/VM guest virtual machines have rebooted. Complete the following steps to create the machines. diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc index 9fabaeef7f..09a62f5677 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -205,7 +205,7 @@ ifdef::gcp[] Google Cloud Platform (GCP). endif::gcp[] ifdef::ibm-cloud[] -IBM Cloud. +{ibm-cloud-name}. endif::ibm-cloud[] ifdef::osp[] {rh-openstack-first}. @@ -559,7 +559,7 @@ vpcName: vpcSubnets: ---- + -For `platform.powervs.vpcName`, specify the name for the existing IBM Cloud VPC. For `platform.powervs.vpcSubnets`, specify the existing subnets. +For `platform.powervs.vpcName`, specify the name for the existing {ibm-cloud-name}. For `platform.powervs.vpcSubnets`, specify the existing subnets. endif::ibm-power-vs+restricted[] .. Add the image content resources, which resemble the following YAML excerpt: diff --git a/modules/installation-obtaining-installer.adoc b/modules/installation-obtaining-installer.adoc index 59252da795..92585609e6 100644 --- a/modules/installation-obtaining-installer.adoc +++ b/modules/installation-obtaining-installer.adoc @@ -90,7 +90,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 VPC 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 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-requirements-user-infra-ibm-z-kvm.adoc b/modules/installation-requirements-user-infra-ibm-z-kvm.adoc index e37d340d5a..0565f6cd1d 100644 --- a/modules/installation-requirements-user-infra-ibm-z-kvm.adoc +++ b/modules/installation-requirements-user-infra-ibm-z-kvm.adoc @@ -50,9 +50,9 @@ See link:https://access.redhat.com/articles/rhel-limits[Red Hat Enterprise Linux The {product-title} installer creates the Ignition files, which are necessary for all the {op-system-first} virtual machines. The automated installation of {product-title} is performed by the bootstrap machine. It starts the installation of {product-title} on each node, starts the Kubernetes cluster, and then finishes. During this bootstrap, the virtual machine must have an established network connection either through a Dynamic Host Configuration Protocol (DHCP) server or static IP address. [id="ibm-z-network-connectivity_{context}"] -== {ibmzProductName} network connectivity requirements +== {ibm-z-title} network connectivity requirements -To install on {ibmzProductName} under {op-system-base} KVM, you need: +To install on {ibm-z-name} under {op-system-base} KVM, you need: * A {op-system-base} KVM host configured with an OSA or RoCE network adapter. * Either a {op-system-base} KVM host that is configured to use bridged networking in libvirt or MacVTap to connect the network to the guests. @@ -63,13 +63,13 @@ See link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/ == Host machine resource requirements The {op-system-base} KVM host in your environment must meet the following requirements to host the virtual machines that you plan for the {product-title} environment. See link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_virtualization/getting-started-with-virtualization-in-rhel-8_configuring-and-managing-virtualization[Getting started with virtualization]. -You can install {product-title} version {product-version} on the following IBM hardware: +You can install {product-title} version {product-version} on the following {ibm-name} hardware: -* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models) -* {linuxoneProductName} 4 (all models), {linuxoneProductName} III (all models), {linuxoneProductName} Emperor II, {linuxoneProductName} Rockhopper II +* {ibm-name} z16 (all models), {ibm-name} z15 (all models), {ibm-name} z14 (all models) +* {ibm-linuxone-name} 4 (all models), {ibm-linuxone-name} III (all models), {ibm-linuxone-name} Emperor II, {ibm-linuxone-name} Rockhopper II [id="minimum-ibm-z-system-requirements_{context}"] -== Minimum {ibmzProductName} system environment +== Minimum {ibm-z-title} system environment [discrete] === Hardware requirements @@ -79,7 +79,7 @@ You can install {product-title} version {product-version} on the following IBM h [NOTE] ==== -You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmzProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. +You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibm-z-name}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. ==== [IMPORTANT] @@ -140,7 +140,7 @@ Each cluster virtual machine must meet the following minimum requirements: -- [id="preferred-ibm-z-system-requirements_{context}"] -== Preferred {ibmzProductName} system environment +== Preferred {ibm-z-title} system environment [discrete] === Hardware requirements @@ -158,7 +158,7 @@ On your {op-system-base} KVM host, set up: * Three guest virtual machines for {product-title} control plane machines, distributed across the {op-system-base} KVM host machines. * At least six guest virtual machines for {product-title} compute machines, distributed across the {op-system-base} KVM host machines. * One guest virtual machine for the temporary {product-title} bootstrap machine. -* To ensure the availability of integral components in an overcommitted environment, increase the priority of the control plane by using `cpu_shares`. Do the same for infrastructure nodes, if they exist. See link:https://www.ibm.com/docs/en/linux-on-systems?topic=domain-schedinfo[schedinfo] in IBM Documentation. +* To ensure the availability of integral components in an overcommitted environment, increase the priority of the control plane by using `cpu_shares`. Do the same for infrastructure nodes, if they exist. See link:https://www.ibm.com/docs/en/linux-on-systems?topic=domain-schedinfo[schedinfo] in {ibm-name} Documentation. [id="preferred-resource-requirements_{context}"] == Preferred resource requirements diff --git a/modules/installation-uninstall-clouds.adoc b/modules/installation-uninstall-clouds.adoc index b81205a876..f2f75dcbeb 100644 --- a/modules/installation-uninstall-clouds.adoc +++ b/modules/installation-uninstall-clouds.adoc @@ -52,7 +52,7 @@ endif::gcp[] cluster. ifdef::ibm-cloud,ibm-power-vs[] * You have configured the `ccoctl` binary. -* You have installed the IBM Cloud CLI and installed or updated the VPC infrastructure service plugin. For more information see "Prerequisites" in the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#cli-ref-prereqs[IBM Cloud VPC CLI documentation]. +* You have installed the {ibm-cloud-name} CLI and installed or updated the VPC infrastructure service plugin. For more information see "Prerequisites" in the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#cli-ref-prereqs[{ibm-cloud-name} CLI documentation]. endif::ibm-cloud,ibm-power-vs[] .Procedure @@ -64,7 +64,7 @@ ifdef::ibm-cloud,ibm-power-vs[] + In which case, the PVCs are not removed when uninstalling the cluster, which might prevent the resource group from being successfully removed. To prevent a failure: -.. Log in to the IBM Cloud using the CLI. +.. Log in to the {ibm-cloud-name} using the CLI. .. To list the PVCs, run the following command: + [source,terminal] @@ -72,7 +72,7 @@ In which case, the PVCs are not removed when uninstalling the cluster, which mig $ ibmcloud is volumes --resource-group-name ---- + -For more information about listing volumes, see the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#volume-cli[IBM Cloud VPC CLI documentation]. +For more information about listing volumes, see the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#volume-cli[{ibm-cloud-name} CLI documentation]. .. To delete the PVCs, run the following command: + @@ -81,7 +81,7 @@ For more information about listing volumes, see the link:https://cloud.ibm.com/d $ ibmcloud is volume-delete --force ---- + -For more information about deleting volumes, see the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#volume-delete[IBM Cloud VPC CLI documentation]. +For more information about deleting volumes, see the link:https://cloud.ibm.com/docs/vpc?topic=vpc-infrastructure-cli-plugin-vpc-reference&interface=ui#volume-delete[{ibm-cloud-name} CLI documentation]. . Export the API key that was created as part of the installation process. endif::ibm-cloud,ibm-power-vs[] diff --git a/modules/logging-vector-fluentd-feature-comparison.adoc b/modules/logging-vector-fluentd-feature-comparison.adoc index 2af0b08a6c..ed2c2622ac 100644 --- a/modules/logging-vector-fluentd-feature-comparison.adoc +++ b/modules/logging-vector-fluentd-feature-comparison.adoc @@ -89,8 +89,8 @@ | Global proxy support | ✓ | ✓ | x86 support | ✓ | ✓ | ARM support | ✓ | ✓ -| {ibmpowerProductName} support | ✓ | ✓ -| {ibmzProductName} support | ✓ | ✓ +| {ibm-power-name} support | ✓ | ✓ +| {ibm-z-name} support | ✓ | ✓ | IPv6 support | ✓ | ✓ | Log event buffering | ✓ | | Disconnected Cluster | ✓ | ✓ diff --git a/modules/machine-user-infra-machines-ibm-z-kvm.adoc b/modules/machine-user-infra-machines-ibm-z-kvm.adoc index e734189c4d..7e6f5cfe9a 100644 --- a/modules/machine-user-infra-machines-ibm-z-kvm.adoc +++ b/modules/machine-user-infra-machines-ibm-z-kvm.adoc @@ -20,7 +20,7 @@ You can create more {op-system-first} compute machines for your cluster by using // Can be removed when bug is fixed. . Disable UDP aggregation. + -Currently, UDP aggregation is not supported on {ibmzProductName} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation. +Currently, UDP aggregation is not supported on {ibm-z-name} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation. .. Create a YAML file `udp-aggregation-config.yaml` with the following content: + diff --git a/modules/machine-user-infra-machines-ibm-z.adoc b/modules/machine-user-infra-machines-ibm-z.adoc index 8f2f9d34db..de8d32d814 100644 --- a/modules/machine-user-infra-machines-ibm-z.adoc +++ b/modules/machine-user-infra-machines-ibm-z.adoc @@ -4,9 +4,9 @@ :_mod-docs-content-type: PROCEDURE [id="machine-user-infra-machines-ibm-z_{context}"] -= Creating {op-system} machines on {ibmzProductName} with z/VM += Creating {op-system} machines on {ibm-z-title} with z/VM -You can create more {op-system-first} compute machines running on {ibmzProductName} with z/VM and attach them to your existing cluster. +You can create more {op-system-first} compute machines running on {ibm-z-name} with z/VM and attach them to your existing cluster. .Prerequisites @@ -18,7 +18,7 @@ You can create more {op-system-first} compute machines running on {ibmzProductNa // Can be removed when bug is fixed. . Disable UDP aggregation. + -Currently, UDP aggregation is not supported on {ibmzProductName} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation. +Currently, UDP aggregation is not supported on {ibm-z-name} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation. .. Create a YAML file `udp-aggregation-config.yaml` with the following content: + @@ -156,7 +156,7 @@ Write all options in the parameter file as a single line and make sure that you . Transfer the `initramfs`, `kernel`, parameter files, and {op-system} images to z/VM, for example, by using FTP. For details about how to transfer the files with FTP and boot from the virtual reader, see link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/installation_guide/sect-installing-zvm-s390[Installing under Z/VM]. . Punch the files to the virtual reader of the z/VM guest virtual machine. + -See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-punch[PUNCH] in IBM Documentation. +See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-punch[PUNCH] in {ibm-name} Documentation. + [TIP] ==== @@ -170,4 +170,4 @@ You can use the CP PUNCH command or, if you use Linux, the **vmur** command to t $ ipl c ---- + -See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] in IBM Documentation. +See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] in {ibm-name} Documentation. diff --git a/modules/machineset-yaml-ibm-cloud.adoc b/modules/machineset-yaml-ibm-cloud.adoc index 3fb59a3435..b47709208a 100644 --- a/modules/machineset-yaml-ibm-cloud.adoc +++ b/modules/machineset-yaml-ibm-cloud.adoc @@ -9,9 +9,9 @@ endif::[] :_mod-docs-content-type: REFERENCE [id="machineset-yaml-ibm-cloud_{context}"] -= Sample YAML for a compute machine set custom resource on IBM Cloud += Sample YAML for a compute machine set custom resource on {ibm-cloud-title} -This sample YAML defines a compute machine set that runs in a specified IBM Cloud zone in a region and creates nodes that are labeled with +This sample YAML defines a compute machine set that runs in a specified {ibm-cloud-name} zone in a region and creates nodes that are labeled with ifndef::infra[`node-role.kubernetes.io/: ""`.] ifdef::infra[`node-role.kubernetes.io/infra: ""`.] @@ -113,7 +113,7 @@ ifdef::infra[] endif::infra[] <4> The custom {op-system-first} image that was used for cluster installation. <5> The infrastructure ID and zone within your region to place machines on. Be sure that your region supports the zone that you specify. -<6> Specify the link:https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui[IBM Cloud instance profile]. +<6> Specify the link:https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui[{ibm-cloud-name} instance profile]. <7> Specify the region to place machines on. <8> The resource group that machine resources are placed in. This is either an existing resource group specified at installation time, or an installer-created resource group named based on the infrastructure ID. <9> The VPC name. diff --git a/modules/machineset-yaml-ibm-power-vs.adoc b/modules/machineset-yaml-ibm-power-vs.adoc index 979693b6f6..eacd60ff12 100644 --- a/modules/machineset-yaml-ibm-power-vs.adoc +++ b/modules/machineset-yaml-ibm-power-vs.adoc @@ -4,9 +4,9 @@ :_mod-docs-content-type: REFERENCE [id="machineset-yaml-ibm-power-vs_{context}"] -= Sample YAML for a compute machine set custom resource on {ibmpowerProductName} Virtual Server += Sample YAML for a compute machine set custom resource on {ibm-power-server-title} -This sample YAML file defines a compute machine set that runs in a specified {ibmpowerProductName} Virtual Server zone in a region and creates nodes that are labeled with `node-role.kubernetes.io/: ""`. +This sample YAML file defines a compute machine set that runs in a specified {ibm-power-server-name} zone in a region and creates nodes that are labeled with `node-role.kubernetes.io/: ""`. In this sample, `` is the infrastructure ID label that is based on the cluster ID that you set when you provisioned the cluster, and `` is the node label to add. diff --git a/modules/manually-create-iam-ibm-cloud.adoc b/modules/manually-create-iam-ibm-cloud.adoc index 86a7fd882b..484691e1a3 100644 --- a/modules/manually-create-iam-ibm-cloud.adoc +++ b/modules/manually-create-iam-ibm-cloud.adoc @@ -40,7 +40,7 @@ endif::[] Installing the cluster requires that the Cloud Credential Operator (CCO) operate in manual mode. While the installation program configures the CCO for manual mode, you must specify the identity and access management secrets for you cloud provider. -You can use the Cloud Credential Operator (CCO) utility (`ccoctl`) to create the required IBM Cloud VPC resources. +You can use the Cloud Credential Operator (CCO) utility (`ccoctl`) to create the required {ibm-cloud-name} resources. .Prerequisites diff --git a/modules/migration-debugging-velero-admission-webhooks-ibm-appconnect.adoc b/modules/migration-debugging-velero-admission-webhooks-ibm-appconnect.adoc index f459f88c50..2b81d5ef8a 100644 --- a/modules/migration-debugging-velero-admission-webhooks-ibm-appconnect.adoc +++ b/modules/migration-debugging-velero-admission-webhooks-ibm-appconnect.adoc @@ -3,9 +3,9 @@ // * backup_and_restore/application_backup_and_restore/troubleshooting.adoc :_mod-docs-content-type: PROCEDURE [id="migration-debugging-velero-admission-webhooks-ibm-appconnect_{context}"] -= Restoring IBM AppConnect resources += Restoring {ibm-title} AppConnect resources -If you experience issues when you use Velero to a restore an IBM AppConnect resource that has an admission webhook, you can run the checks in this procedure. +If you experience issues when you use Velero to a restore an {ibm-name} AppConnect resource that has an admission webhook, you can run the checks in this procedure. .Procedure diff --git a/modules/minimum-ibm-power-system-requirements.adoc b/modules/minimum-ibm-power-system-requirements.adoc index 1396e45f4e..d9e8ffd614 100644 --- a/modules/minimum-ibm-power-system-requirements.adoc +++ b/modules/minimum-ibm-power-system-requirements.adoc @@ -5,15 +5,15 @@ :_mod-docs-content-type: CONCEPT [id="minimum-ibm-power-system-requirements_{context}"] -= Minimum IBM Power requirements += Minimum {ibm-power-title} requirements -You can install {product-title} version {product-version} on the following IBM hardware: +You can install {product-title} version {product-version} on the following {ibm-name} hardware: -* IBM Power9 or Power10 processor-based systems +* {ibm-power-name}9 or {ibm-power-name}10 processor-based systems [NOTE] ==== -Support for {op-system} functionality for all IBM Power8 models, IBM Power AC922, IBM Power IC922, and IBM Power LC922 is deprecated in {product-title} {product-version}. Red Hat recommends that you use later hardware models. +Support for {op-system} functionality for all {ibm-power-name}8 models, {ibm-power-name} AC922, {ibm-power-name} IC922, and {ibm-power-name} LC922 is deprecated in {product-title} {product-version}. Red Hat recommends that you use later hardware models. ==== [discrete] @@ -24,16 +24,16 @@ Support for {op-system} functionality for all IBM Power8 models, IBM Power AC922 [discrete] == Operating system requirements -* One instance of an IBM Power9 or Power10 processor-based system +* One instance of an {ibm-power-name}9 or Power10 processor-based system -On your IBM Power instance, set up: +On your {ibm-power-name} instance, set up: * Three LPARs for {product-title} control plane machines * Two LPARs for {product-title} compute machines * One LPAR for the temporary {product-title} bootstrap machine [discrete] -== Disk storage for the IBM Power guest virtual machines +== Disk storage for the {ibm-power-title} guest virtual machines * Local storage, or storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) @@ -42,7 +42,7 @@ On your IBM Power instance, set up: * Dedicated physical adapter, or SR-IOV virtual function * Available by the Virtual I/O Server using Shared Ethernet Adapter -* Virtualized by the Virtual I/O Server using IBM vNIC +* Virtualized by the Virtual I/O Server using {ibm-name} vNIC [discrete] == Storage / main memory diff --git a/modules/minimum-ibm-z-system-requirements.adoc b/modules/minimum-ibm-z-system-requirements.adoc index 86263df054..c3be720deb 100644 --- a/modules/minimum-ibm-z-system-requirements.adoc +++ b/modules/minimum-ibm-z-system-requirements.adoc @@ -5,12 +5,12 @@ :_mod-docs-content-type: CONCEPT [id="minimum-ibm-z-system-requirements_{context}"] -= Minimum {ibmzProductName} system environment += Minimum {ibm-z-title} system environment -You can install {product-title} version {product-version} on the following IBM hardware: +You can install {product-title} version {product-version} on the following {ibm-name} hardware: -* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models) -* {linuxoneProductName} 4 (all models), {linuxoneProductName} III (all models), {linuxoneProductName} Emperor II, {linuxoneProductName} Rockhopper II +* {ibm-name} z16 (all models), {ibm-name} z15 (all models), {ibm-name} z14 (all models) +* {ibm-linuxone-name} 4 (all models), {ibm-linuxone-name} III (all models), {ibm-linuxone-name} Emperor II, {ibm-linuxone-name} Rockhopper II [discrete] == Hardware requirements @@ -20,7 +20,7 @@ You can install {product-title} version {product-version} on the following IBM h [NOTE] ==== -You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmzProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. +You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibm-z-name}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster. ==== [IMPORTANT] @@ -40,9 +40,9 @@ On your z/VM instance, set up: * One guest virtual machine for the temporary {product-title} bootstrap machine [discrete] -== {ibmzProductName} network connectivity requirements +== {ibm-z-title} network connectivity requirements -To install on {ibmzProductName} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need: +To install on {ibm-z-name} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need: * A direct-attached OSA or RoCE network adapter * A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation. diff --git a/modules/nodes-pods-plugins-about.adoc b/modules/nodes-pods-plugins-about.adoc index 13967cf7da..b71fed8dab 100644 --- a/modules/nodes-pods-plugins-about.adoc +++ b/modules/nodes-pods-plugins-about.adoc @@ -54,7 +54,7 @@ service DevicePlugin { * link:https://github.com/NVIDIA/k8s-device-plugin[Nvidia official GPU device plugin] * link:https://github.com/vikaschoudhary16/sfc-device-plugin[Solarflare device plugin] * link:https://github.com/kubevirt/kubernetes-device-plugins[KubeVirt device plugins: vfio and kvm] -* link:https://github.com/ibm-s390-cloud/k8s-cex-dev-plugin[Kubernetes device plugin for IBM Crypto Express (CEX) cards] +* link:https://github.com/ibm-s390-cloud/k8s-cex-dev-plugin[Kubernetes device plugin for {ibm-name} Crypto Express (CEX) cards] [NOTE] diff --git a/modules/nw-egress-ips-about.adoc b/modules/nw-egress-ips-about.adoc index a797fd2ef5..5b1fb879b8 100644 --- a/modules/nw-egress-ips-about.adoc +++ b/modules/nw-egress-ips-about.adoc @@ -48,9 +48,9 @@ Support for the egress IP address functionality on various platforms is summariz | Amazon Web Services (AWS) | Yes | Google Cloud Platform (GCP) | Yes | Microsoft Azure | Yes -| {ibmzProductName} and {linuxoneProductName} | Yes -| {ibmzProductName} and {linuxoneProductName} for {op-system-base-full} KVM | Yes -| {ibmpowerProductName} | Yes +| {ibm-z-name} and {ibm-linuxone-name} | Yes +| {ibm-z-name} and {ibm-linuxone-name} for {op-system-base-full} KVM | Yes +| {ibm-power-name} | Yes | Nutanix | Yes |=== diff --git a/modules/nw-metallb-infra-considerations.adoc b/modules/nw-metallb-infra-considerations.adoc index 0c17bec462..b45d3cc4a8 100644 --- a/modules/nw-metallb-infra-considerations.adoc +++ b/modules/nw-metallb-infra-considerations.adoc @@ -13,10 +13,10 @@ For example, the following infrastructures can benefit from adding the MetalLB O * VMware vSphere -* {ibmzProductName} and {linuxoneProductName} +* {ibm-z-name} and {ibm-linuxone-name} -* {ibmzProductName} and {linuxoneProductName} for {op-system-base-full} KVM +* {ibm-z-name} and {ibm-linuxone-name} for {op-system-base-full} KVM -* {ibmpowerProductName} +* {ibm-power-name} MetalLB Operator and MetalLB are supported with the OpenShift SDN and OVN-Kubernetes network providers. \ No newline at end of file diff --git a/modules/nw-ovn-kubernetes-matrix.adoc b/modules/nw-ovn-kubernetes-matrix.adoc index 46d37d1a13..2c9ca49852 100644 --- a/modules/nw-ovn-kubernetes-matrix.adoc +++ b/modules/nw-ovn-kubernetes-matrix.adoc @@ -64,7 +64,7 @@ endif::[] 2. Egress router for OVN-Kubernetes supports only redirect mode. -3. IPv6 is supported only on bare metal, vSphere, {ibmpowerProductName}, and {ibmzProductName} clusters. +3. IPv6 is supported only on bare metal, vSphere, {ibm-power-name}, and {ibm-z-name} clusters. -4. IPv6 single stack is not supported on {ibmpowerProductName} and {ibmzProductName} clusters. +4. IPv6 single stack is not supported on {ibm-power-name} and {ibm-z-name} clusters. -- diff --git a/modules/nw-ovn-kubernetes-migration-about.adoc b/modules/nw-ovn-kubernetes-migration-about.adoc index d3304b6c72..2114963afd 100644 --- a/modules/nw-ovn-kubernetes-migration-about.adoc +++ b/modules/nw-ovn-kubernetes-migration-about.adoc @@ -12,7 +12,7 @@ A migration to the OVN-Kubernetes network plugin is supported on the following p * Bare metal hardware * Amazon Web Services (AWS) * Google Cloud Platform (GCP) -* IBM Cloud +* {ibm-cloud-name} * Microsoft Azure * {rh-openstack-first} * VMware vSphere diff --git a/modules/oadp-ibm-power-test-support.adoc b/modules/oadp-ibm-power-test-support.adoc index 8068d180cc..5d10dd8445 100644 --- a/modules/oadp-ibm-power-test-support.adoc +++ b/modules/oadp-ibm-power-test-support.adoc @@ -4,6 +4,6 @@ :_mod-docs-content-type: CONCEPT [id="oadp-ibm-power-test-matrix_{context}"] -= OADP support for target backup locations using IBM Power += OADP support for target backup locations using {ibm-power-title} -IBM Power running with {product-title} 4.11 and 4.12, and OpenShift API for Data Protection (OADP) 1.1.2 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running IBM Power with {product-title} 4.11 and 4.12, and OADP 1.1.2 against all non-AWS S3 backup location targets as well. +{ibm-power-name} running with {product-title} 4.11 and 4.12, and OpenShift API for Data Protection (OADP) 1.1.2 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.11 and 4.12, and OADP 1.1.2 against all non-AWS S3 backup location targets as well. diff --git a/modules/oadp-ibm-z-test-support.adoc b/modules/oadp-ibm-z-test-support.adoc index 22f84ddf59..f1a9dba1c0 100644 --- a/modules/oadp-ibm-z-test-support.adoc +++ b/modules/oadp-ibm-z-test-support.adoc @@ -4,6 +4,6 @@ :_mod-docs-content-type: CONCEPT [id="oadp-ibm-z-test-support_{context}"] -= OADP testing and support for target backup locations using {ibmzProductName} += OADP testing and support for target backup locations using {ibm-z-title} -{ibmzProductName} running with {product-title} 4.11 and 4.12, and OpenShift API for Data Protection (OADP) 1.1.2 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibmzProductName} with {product-title} 4.11 and 4.12, and OADP 1.1.2 against all non-AWS S3 backup location targets as well. +{ibm-z-name} running with {product-title} 4.11 and 4.12, and OpenShift API for Data Protection (OADP) 1.1.2 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.11 and 4.12, and OADP 1.1.2 against all non-AWS S3 backup location targets as well. diff --git a/modules/oadp-s3-compatible-backup-storage-providers.adoc b/modules/oadp-s3-compatible-backup-storage-providers.adoc index 7d0670d4f3..02c2628b4e 100644 --- a/modules/oadp-s3-compatible-backup-storage-providers.adoc +++ b/modules/oadp-s3-compatible-backup-storage-providers.adoc @@ -30,7 +30,7 @@ The following compatible object storage providers are supported and have their o The following AWS S3 compatible object storage providers, are known to work with Velero through the AWS plugin, for use as backup storage locations, however, they are unsupported and have not been tested by Red Hat: -* IBM Cloud +* {ibm-cloud-name} * Oracle Cloud * DigitalOcean * NooBaa, unless installed using Multicloud Object Gateway (MCG) diff --git a/modules/olm-arch-os-support.adoc b/modules/olm-arch-os-support.adoc index dc138b536c..6213109ef0 100644 --- a/modules/olm-arch-os-support.adoc +++ b/modules/olm-arch-os-support.adoc @@ -15,10 +15,10 @@ The following strings are supported in Operator Lifecycle Manager (OLM) on {prod |AMD64 |`amd64` -|{ibmpowerProductName} +|{ibm-power-name} |`ppc64le` -|{ibmzProductName} +|{ibm-z-name} |`s390x` |=== diff --git a/modules/olm-pruning-index-image.adoc b/modules/olm-pruning-index-image.adoc index ce8feaf378..93701ebb5b 100644 --- a/modules/olm-pruning-index-image.adoc +++ b/modules/olm-pruning-index-image.adoc @@ -127,7 +127,7 @@ $ opm index prune \ ---- <1> Index to prune. <2> Comma-separated list of packages to keep. -<3> Required only for {ibmpowerProductName} and {ibmzProductName} images: Operator Registry base image with the tag that matches the target {product-title} cluster major and minor version. +<3> Required only for {ibm-power-name} and {ibm-z-name} images: Operator Registry base image with the tag that matches the target {product-title} cluster major and minor version. <4> Custom tag for new index image being built. . Run the following command to push the new index image to your target registry: diff --git a/modules/op-installing-pipelines-as-code-cli.adoc b/modules/op-installing-pipelines-as-code-cli.adoc index 7c7daae98c..61db856634 100644 --- a/modules/op-installing-pipelines-as-code-cli.adoc +++ b/modules/op-installing-pipelines-as-code-cli.adoc @@ -12,8 +12,8 @@ Cluster administrators can use the `tkn pac` and `opc` CLI tools on local machin You can install the `tkn pac` and `opc` version `1.11.0` binaries for the supported platforms: * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-linux-amd64.tar.gz[Linux (x86_64, amd64)] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-linux-s390x.tar.gz[Linux on {ibmzProductName} and {linuxoneProductName} (s390x)] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-linux-ppc64le.tar.gz[Linux on {ibmpowerProductName} (ppc64le)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-linux-s390x.tar.gz[Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-linux-ppc64le.tar.gz[Linux on {ibm-power-name} (ppc64le)] * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-macos-amd64.tar.gz[macOS] * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/1.11.0/tkn-windows-amd64.zip[Windows] diff --git a/modules/op-installing-tkn-on-linux-using-rpm.adoc b/modules/op-installing-tkn-on-linux-using-rpm.adoc index 5e24466f7a..34786cfd5e 100644 --- a/modules/op-installing-tkn-on-linux-using-rpm.adoc +++ b/modules/op-installing-tkn-on-linux-using-rpm.adoc @@ -54,14 +54,14 @@ For {op-system-base-full} version 8, you can install the {pipelines-title} CLI a # subscription-manager repos --enable="pipelines-{pipelines-version-number}-for-rhel-8-x86_64-rpms" ---- + -* Linux on {ibmzProductName} and {linuxoneProductName} (s390x) +* Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x) + [source,terminal,subs="attributes"] ---- # subscription-manager repos --enable="pipelines-{pipelines-version-number}-for-rhel-8-s390x-rpms" ---- + -* Linux on {ibmpowerProductName} (ppc64le) +* Linux on {ibm-power-name} (ppc64le) + [source,terminal,subs="attributes"] ---- diff --git a/modules/op-installing-tkn-on-linux.adoc b/modules/op-installing-tkn-on-linux.adoc index 844945570b..128e48321a 100644 --- a/modules/op-installing-tkn-on-linux.adoc +++ b/modules/op-installing-tkn-on-linux.adoc @@ -16,9 +16,9 @@ For Linux distributions, you can download the CLI as a `tar.gz` archive. * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-amd64.tar.gz[Linux (x86_64, amd64)] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-s390x.tar.gz[Linux on {ibmzProductName} and {linuxoneProductName} (s390x)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-s390x.tar.gz[Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x)] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-ppc64le.tar.gz[Linux on {ibmpowerProductName} (ppc64le)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-ppc64le.tar.gz[Linux on {ibm-power-name} (ppc64le)] * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/{pipelines-version-number}.0/tkn-linux-arm64.tar.gz[Linux on ARM (aarch64, arm64)] diff --git a/modules/op-release-notes-1-10.adoc b/modules/op-release-notes-1-10.adoc index 35778630f4..d5f0b92c40 100644 --- a/modules/op-release-notes-1-10.adoc +++ b/modules/op-release-notes-1-10.adoc @@ -135,7 +135,7 @@ include::snippets/technology-preview.adoc[] ---- $ oc get tektoninstallersets.operator.tekton.dev | awk '/pipeline-main-static/ {print $1}' | xargs oc delete tektoninstallersets ---- -* With this update, usage of external databases, such as the Crunchy PostgreSQL is not supported on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. Instead, use the default {tekton-hub} database. +* With this update, usage of external databases, such as the Crunchy PostgreSQL is not supported on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. Instead, use the default {tekton-hub} database. [id="fixed-issues-1-10_{context}"] == Fixed issues diff --git a/modules/op-release-notes-1-2.adoc b/modules/op-release-notes-1-2.adoc index c9d8b03e88..371e05d8c7 100644 --- a/modules/op-release-notes-1-2.adoc +++ b/modules/op-release-notes-1-2.adoc @@ -14,7 +14,7 @@ * Tekton Triggers 0.8.1 * cluster tasks based on Tekton Catalog 0.16 * IBM Power Systems on {product-title} 4.6 -* IBM Z and LinuxONE on {product-title} 4.6 +* {ibm-z-name} and {ibm-linuxone-name} on {product-title} 4.6 In addition to the fixes and stability improvements, the following sections highlight what is new in {pipelines-title} 1.2. @@ -26,7 +26,7 @@ In addition to the fixes and stability improvements, the following sections high + [NOTE] ==== -Installations in restricted environments are currently not supported on IBM Power Systems, IBM Z, and LinuxONE. +Installations in restricted environments are currently not supported on {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}. ==== * You can now use the `when` field, instead of `conditions` resource, to run a task only when certain criteria are met. The key components of `WhenExpression` resources are `Input`, `Operator`, and `Values`. If all the when expressions evaluate to `True`, then the task is run. If any of the when expressions evaluate to `False`, the task is skipped. @@ -104,7 +104,7 @@ $ oc patch el/github-listener-interceptor -p '{"metadata":{"finalizers":["foregr $ oc patch crd/eventlisteners.triggers.tekton.dev -p '{"metadata":{"finalizers":[]}}' --type=merge ---- -* When you run a multi-arch container image task without command specification on an IBM Power Systems (ppc64le) or IBM Z (s390x) cluster, the `TaskRun` resource fails with the following error: +* When you run a multi-arch container image task without command specification on an {ibm-power-name} Systems (ppc64le) or {ibm-z-name} (s390x) cluster, the `TaskRun` resource fails with the following error: + [source,terminal] ---- diff --git a/modules/op-release-notes-1-3.adoc b/modules/op-release-notes-1-3.adoc index 60f9f7f528..fc97e0b316 100644 --- a/modules/op-release-notes-1-3.adoc +++ b/modules/op-release-notes-1-3.adoc @@ -13,8 +13,8 @@ * Tekton `tkn` CLI 0.15.0 * Tekton Triggers 0.10.2 * cluster tasks based on Tekton Catalog 0.19.0 -* IBM Power Systems on {product-title} 4.7 -* IBM Z and LinuxONE on {product-title} 4.7 +* {ibm-power-name} Systems on {product-title} 4.7 +* {ibm-z-name} and {ibm-linuxone-name} on {product-title} 4.7 In addition to the fixes and stability improvements, the following sections highlight what is new in {pipelines-title} 1.3. diff --git a/modules/op-release-notes-1-4.adoc b/modules/op-release-notes-1-4.adoc index 58d0baa66f..ac64b6569e 100644 --- a/modules/op-release-notes-1-4.adoc +++ b/modules/op-release-notes-1-4.adoc @@ -125,9 +125,9 @@ Upgrade from {pipelines-shortname} 1.3.x and earlier versions to {pipelines-shor * In the *Developer* perspective, the pipeline metrics and triggers features are available only on {product-title} 4.7.6 or later versions. -* On IBM Power Systems, IBM Z, and LinuxONE, the `tkn hub` command is not supported. +* On {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}, the `tkn hub` command is not supported. -* When you run Maven and Jib Maven cluster tasks on an IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) clusters, set the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. +* When you run Maven and Jib Maven cluster tasks on an {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) clusters, set the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. * Triggers throw error resulting from bad handling of the JSON format, if you have the following configuration in the trigger binding: + diff --git a/modules/op-release-notes-1-5.adoc b/modules/op-release-notes-1-5.adoc index 90b5789450..c27e32762b 100644 --- a/modules/op-release-notes-1-5.adoc +++ b/modules/op-release-notes-1-5.adoc @@ -294,9 +294,9 @@ For {pipelines-title} installed by the Operator, if you do not clone the `git-cl . Use the service account while executing a task or a pipeline. -* On IBM Power Systems, IBM Z, and LinuxONE, the `s2i-dotnet` cluster task and the `tkn hub` command are unsupported. +* On {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}, the `s2i-dotnet` cluster task and the `tkn hub` command are unsupported. -* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. +* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. [id="fixed-issues-1-5_{context}"] == Fixed issues diff --git a/modules/op-release-notes-1-6.adoc b/modules/op-release-notes-1-6.adoc index e41cc79d65..7057d006c7 100644 --- a/modules/op-release-notes-1-6.adoc +++ b/modules/op-release-notes-1-6.adoc @@ -194,13 +194,13 @@ The `disable-working-directory-overwrite` and `disable-home-env-overwrite` field [id="known-issues-1-6_{context}"] == Known issues -* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. +* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. // issue # is unknown. -* On IBM Power Systems, IBM Z, and LinuxONE, the `s2i-dotnet` cluster task is unsupported. +* On {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}, the `s2i-dotnet` cluster task is unsupported. // issue # is unknown. -* Before you install tasks based on the Tekton Catalog on IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` +* Before you install tasks based on the Tekton Catalog on {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` // issue # is unknown. * You cannot use the `nodejs:14-ubi8-minimal` image stream because doing so generates the following errors: @@ -220,7 +220,7 @@ time="2021-11-04T13:05:26Z" level=error msg="exit status 127" [id="fixed-issues-1-6_{context}"] == Fixed issues -* The `tkn hub` command is now supported on IBM Power Systems, IBM Z, and LinuxONE. +* The `tkn hub` command is now supported on {ibm-power-name}, {ibm-z-name}, and LinuxONE. // issue # is unknown. //[id="fixed-cli-0-21-0-1-6_{context}"] diff --git a/modules/op-release-notes-1-7.adoc b/modules/op-release-notes-1-7.adoc index 54cc4773b5..c069d6a3f5 100644 --- a/modules/op-release-notes-1-7.adoc +++ b/modules/op-release-notes-1-7.adoc @@ -267,16 +267,16 @@ Pipelines as Code supports the following features: [id="known-issues-1-7_{context}"] == Known issues -* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on ARM, IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. +* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on ARM, {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) clusters. As a workaround, you can specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. // issue # is unknown. + [TIP] ==== -Before you install tasks that are based on the Tekton Catalog on ARM, IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` +Before you install tasks that are based on the Tekton Catalog on ARM, {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` // issue # is unknown. ==== -* On IBM Power Systems, IBM Z, and LinuxONE, the `s2i-dotnet` cluster task is unsupported. +* On {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}, the `s2i-dotnet` cluster task is unsupported. // issue # is unknown. * You cannot use the `nodejs:14-ubi8-minimal` image stream because doing so generates the following errors: diff --git a/modules/op-release-notes-1-8.adoc b/modules/op-release-notes-1-8.adoc index 8d73470ff3..8e196dbcc9 100644 --- a/modules/op-release-notes-1-8.adoc +++ b/modules/op-release-notes-1-8.adoc @@ -372,18 +372,18 @@ Workaround: Use `nodejs:14-ubi8` rather than the `nodejs:14-ubi8-minimal` image // .ARM (Tech Preview feature) -* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on ARM, IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) clusters. +* When you run Maven and Jib-Maven cluster tasks, the default container image is supported only on Intel (x86) architecture. Therefore, tasks will fail on ARM, {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) clusters. + Workaround: Specify a custom image by setting the `MAVEN_IMAGE` parameter value to `maven:3.6.3-adoptopenjdk-11`. + [TIP] ==== -Before you install tasks that are based on the Tekton Catalog on ARM, IBM Power Systems (ppc64le), IBM Z, and LinuxONE (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` +Before you install tasks that are based on the Tekton Catalog on ARM, {ibm-power-name} Systems (ppc64le), {ibm-z-name}, and {ibm-linuxone-name} (s390x) using `tkn hub`, verify if the task can be executed on these platforms. To check if `ppc64le` and `s390x` are listed in the "Platforms" section of the task information, you can run the following command: `tkn hub info task ` // issue # is unknown. ==== // link:https://issues.redhat.com/browse/SRVKP-2375 for ARM issue -* On ARM, IBM Power Systems, IBM Z, and LinuxONE, the `s2i-dotnet` cluster task is unsupported. +* On ARM, {ibm-power-name} Systems, {ibm-z-name}, and {ibm-linuxone-name}, the `s2i-dotnet` cluster task is unsupported. // issue # is unknown. Added ARM in 1.8 // Pipelines diff --git a/modules/openshift-cluster-maximums-environment.adoc b/modules/openshift-cluster-maximums-environment.adoc index a9ed94089a..66c5963ec4 100644 --- a/modules/openshift-cluster-maximums-environment.adoc +++ b/modules/openshift-cluster-maximums-environment.adoc @@ -57,7 +57,7 @@ 5. Cluster is scaled in iterations and performance and scalability tests are executed at the specified node counts. -- -== IBM Power platform +== {ibm-power-title} platform [options="header",cols="6*"] |=== @@ -101,7 +101,7 @@ 5. Cluster is scaled in iterations. -- -== {ibmzProductName} platform +== {ibm-z-title} platform [options="header",cols="6*"] |=== diff --git a/modules/ossm-federation-across-cluster.adoc b/modules/ossm-federation-across-cluster.adoc index 2809c0e125..f9b375d6c6 100644 --- a/modules/ossm-federation-across-cluster.adoc +++ b/modules/ossm-federation-across-cluster.adoc @@ -16,8 +16,8 @@ If the cluster runs on bare metal and fully supports `LoadBalancer` services, th If the cluster does not support `LoadBalancer` services, using a `NodePort` service could be an option if the nodes are accessible from the cluster running the other mesh. In the `ServiceMeshPeer` object, specify the IP addresses of the nodes in the `.spec.remote.addresses` field and the service's node ports in the `.spec.remote.discoveryPort` and `.spec.remote.servicePort` fields. ifndef::openshift-rosa[] -== Exposing the federation ingress on clusters running on {ibmpowerProductName} and {ibmzProductName} -If the cluster runs on {ibmpowerProductName} or {ibmzProductName} infrastructure and fully supports `LoadBalancer` services, the IP address found in the `.status.loadBalancer.ingress.ip` field of the ingress gateway `Service` object should be specified as one of the entries in the `.spec.remote.addresses` field of the `ServiceMeshPeer` object. +== Exposing the federation ingress on clusters running on {ibm-power-title} and {ibm-z-title} +If the cluster runs on {ibm-power-name} or {ibm-z-name} infrastructure and fully supports `LoadBalancer` services, the IP address found in the `.status.loadBalancer.ingress.ip` field of the ingress gateway `Service` object should be specified as one of the entries in the `.spec.remote.addresses` field of the `ServiceMeshPeer` object. If the cluster does not support `LoadBalancer` services, using a `NodePort` service could be an option if the nodes are accessible from the cluster running the other mesh. In the `ServiceMeshPeer` object, specify the IP addresses of the nodes in the `.spec.remote.addresses` field and the service's node ports in the `.spec.remote.discoveryPort` and `.spec.remote.servicePort` fields. endif::openshift-rosa[] diff --git a/modules/ossm-rn-known-issues.adoc b/modules/ossm-rn-known-issues.adoc index 343841bb14..7202de8c4c 100644 --- a/modules/ossm-rn-known-issues.adoc +++ b/modules/ossm-rn-known-issues.adoc @@ -22,13 +22,13 @@ These limitations exist in {SMProductName}: * The first time you access related services such as {JaegerShortName} and Grafana, from the Kiali console, you must accept the certificate and re-authenticate using your {product-title} login credentials. This happens due to an issue with how the framework displays embedded pages in the console. ifndef::openshift-rosa[] -* The Bookinfo sample application cannot be installed on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +* The Bookinfo sample application cannot be installed on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. -* WebAssembly extensions are not supported on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +* WebAssembly extensions are not supported on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. -* LuaJIT is not supported on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +* LuaJIT is not supported on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. -* Single stack IPv6 support is not available on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +* Single stack IPv6 support is not available on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. endif::openshift-rosa[] [id="ossm-rn-known-issues-ossm_{context}"] @@ -132,7 +132,7 @@ endif::openshift-rosa[] * link:https://issues.redhat.com/browse/MAISTRA-2692[MAISTRA-2692] With Mixer removed, custom metrics that have been defined in {SMProductShortName} 2.0.x cannot be used in 2.1. Custom metrics can be configured using `EnvoyFilter`. Red Hat is unable to support `EnvoyFilter` configuration except where explicitly documented. This is due to tight coupling with the underlying Envoy APIs, meaning that backward compatibility cannot be maintained. ifndef::openshift-rosa[] -* link:https://issues.redhat.com/browse/MAISTRA-2648[MAISTRA-2648] Service mesh extensions are currently not compatible with meshes deployed on {ibmzProductName}. +* link:https://issues.redhat.com/browse/MAISTRA-2648[MAISTRA-2648] Service mesh extensions are currently not compatible with meshes deployed on {ibm-z-name}. endif::openshift-rosa[] * link:https://issues.jboss.org/browse/MAISTRA-1959[MAISTRA-1959] _Migration to 2.0_ Prometheus scraping (`spec.addons.prometheus.scrape` set to `true`) does not work when mTLS is enabled. Additionally, Kiali displays extraneous graph data when mTLS is disabled. diff --git a/modules/ossm-rn-new-features.adoc b/modules/ossm-rn-new-features.adoc index 3c88178bee..164e4cd110 100644 --- a/modules/ossm-rn-new-features.adoc +++ b/modules/ossm-rn-new-features.adoc @@ -173,7 +173,7 @@ With this update, {SMProductName} integrates with the `cert-manager` controller [NOTE] ==== -Integration with `cert-manager` and `istio-csr` is not supported on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +Integration with `cert-manager` and `istio-csr` is not supported on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. ==== === Integration with external authorization systems @@ -207,7 +207,7 @@ This enhancement introduces generally available support for single stack IPv6 cl [NOTE] ==== -Single stack IPv6 support is not available on {ibmpowerProductName}, {ibmzProductName}, and {linuxoneProductName}. +Single stack IPv6 support is not available on {ibm-power-name}, {ibm-z-name}, and {ibm-linuxone-name}. ==== === {product-title} Gateway API support @@ -1575,7 +1575,7 @@ In addition, this release has the following new features: == New features {SMProductName} 2.0.2 ifndef::openshift-rosa[] -This release of {SMProductName} adds support for IBM Z and IBM Power Systems. It also addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes. +This release of {SMProductName} adds support for {ibm-z-name} and {ibm-power-name} Systems. It also addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes. endif::openshift-rosa[] ifdef::openshift-rosa[] This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes. diff --git a/modules/ossm-supported-configurations.adoc b/modules/ossm-supported-configurations.adoc index cbcc2baeed..bd817b9326 100644 --- a/modules/ossm-supported-configurations.adoc +++ b/modules/ossm-supported-configurations.adoc @@ -43,9 +43,9 @@ Explicitly unsupported cases include: == Supported configurations for {SMProductShortName} ifndef::openshift-rosa[] -* This release of {SMProductName} is only available on {product-title} x86_64, {ibmzProductName}, and {ibmpowerProductName}. -** {ibmzProductName} is only supported on {product-title} 4.10 and later. -** {ibmpowerProductName} is only supported on {product-title} 4.10 and later. +* This release of {SMProductName} is only available on {product-title} x86_64, {ibm-z-name}, and {ibm-power-name}. +** {ibm-z-name} is only supported on {product-title} 4.10 and later. +** {ibm-power-name} is only supported on {product-title} 4.10 and later. endif::openshift-rosa[] ifdef::openshift-rosa[] * This release of {SMProductName} is only available on {product-title} x86_64. diff --git a/modules/ossm-tutorial-bookinfo-install.adoc b/modules/ossm-tutorial-bookinfo-install.adoc index 795ac3bf2a..ffecfa1f71 100644 --- a/modules/ossm-tutorial-bookinfo-install.adoc +++ b/modules/ossm-tutorial-bookinfo-install.adoc @@ -20,7 +20,7 @@ This tutorial walks you through how to create a sample application by creating a ifndef::openshift-rosa[] [NOTE] ==== -The Bookinfo sample application cannot be installed on {ibmzProductName} and {ibmpowerProductName}. +The Bookinfo sample application cannot be installed on {ibm-z-name} and {ibm-power-name}. ==== endif::openshift-rosa[] diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index f6558e088f..fa15a4dbed 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -38,8 +38,8 @@ ifndef::openshift-rosa[] |GCP Filestore | ✅ | - | ✅| - endif::openshift-rosa[] ifndef::openshift-dedicated,openshift-rosa[] -|{ibmpowerProductName} Virtual Server Block | - | - | ✅ | - -|IBM VPC Block | ✅^[3]^ | - | ✅^[3]^| - +|{ibm-power-server-name} Block | - | - | ✅ | - +|{ibm-cloud-name} Block | ✅^[3]^ | - | ✅^[3]^| - |Microsoft Azure Disk | ✅ | ✅ | ✅| - |Microsoft Azure Stack Hub | ✅ | ✅ | ✅| - |Microsoft Azure File | - | - | ✅| ✅ diff --git a/modules/preferred-ibm-z-system-requirements.adoc b/modules/preferred-ibm-z-system-requirements.adoc index 4bd78405ed..741e477019 100644 --- a/modules/preferred-ibm-z-system-requirements.adoc +++ b/modules/preferred-ibm-z-system-requirements.adoc @@ -5,7 +5,7 @@ :_mod-docs-content-type: CONCEPT [id="preferred-ibm-z-system-requirements_{context}"] -= Preferred {ibmzProductName} system environment += Preferred {ibm-z-title} system environment [discrete] == Hardware requirements @@ -24,12 +24,12 @@ On your z/VM instances, set up: * Three guest virtual machines for {product-title} control plane machines, one per z/VM instance. * At least six guest virtual machines for {product-title} compute machines, distributed across the z/VM instances. * One guest virtual machine for the temporary {product-title} bootstrap machine. -* To ensure the availability of integral components in an overcommitted environment, increase the priority of the control plane by using the CP command `SET SHARE`. Do the same for infrastructure nodes, if they exist. See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-set-share[SET SHARE] in IBM Documentation. +* To ensure the availability of integral components in an overcommitted environment, increase the priority of the control plane by using the CP command `SET SHARE`. Do the same for infrastructure nodes, if they exist. See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-set-share[SET SHARE] in {ibm-name} Documentation. [discrete] -== {ibmzProductName} network connectivity requirements +== {ibm-z-title} network connectivity requirements -To install on {ibmzProductName} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need: +To install on {ibm-z-name} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need: * A direct-attached OSA or RoCE network adapter * A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation. diff --git a/modules/private-clusters-about-ibm-cloud.adoc b/modules/private-clusters-about-ibm-cloud.adoc index 87aa100c20..e36e5b2e86 100644 --- a/modules/private-clusters-about-ibm-cloud.adoc +++ b/modules/private-clusters-about-ibm-cloud.adoc @@ -4,11 +4,11 @@ :_mod-docs-content-type: CONCEPT [id="private-clusters-about-ibm-cloud_{context}"] -= Private clusters in IBM Cloud VPC += Private clusters in {ibm-cloud-title} -To create a private cluster on IBM Cloud VPC, you must provide an existing private VPC and subnets to host the cluster. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic. +To create a private cluster on {ibm-cloud-name}, you must provide an existing private VPC and subnets to host the cluster. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic. -The cluster still requires access to internet to access the IBM Cloud VPC APIs. +The cluster still requires access to internet to access the {ibm-cloud-name} APIs. The following items are not required or created when you install a private cluster: @@ -21,4 +21,4 @@ The installation program does use the `baseDomain` that you specify to create a [id="private-clusters-limitations-ibm-cloud_{context}"] == Limitations -Private clusters on IBM Cloud VPC are subject only to the limitations associated with the existing VPC that was used for cluster deployment. +Private clusters on {ibm-cloud-name} are subject only to the limitations associated with the existing VPC that was used for cluster deployment. diff --git a/modules/private-clusters-about-ibm-power-vs.adoc b/modules/private-clusters-about-ibm-power-vs.adoc index cde2d54a86..1f3c6fef43 100644 --- a/modules/private-clusters-about-ibm-power-vs.adoc +++ b/modules/private-clusters-about-ibm-power-vs.adoc @@ -4,11 +4,11 @@ :_mod-docs-content-type: CONCEPT [id="private-clusters-about-ibm-power-virtual-server_{context}"] -= Private clusters in IBM Power Virtual Server += Private clusters in {ibm-power-server-title} -To create a private cluster on IBM Power Virtual Server, you must provide an existing private Virtual Private Cloud (VPC) and subnets to host the cluster. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic. +To create a private cluster on {ibm-power-server-name}, you must provide an existing private Virtual Private Cloud (VPC) and subnets to host the cluster. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic. -The cluster still requires access to internet to access the IBM Cloud VPC APIs. +The cluster still requires access to internet to access the {ibm-cloud-name} APIs. The following items are not required or created when you install a private cluster: @@ -16,9 +16,9 @@ The following items are not required or created when you install a private clust * Public network load balancers, which support public Ingress * A public DNS zone that matches the `baseDomain` for the cluster -You will also need to create an IBM DNS service containing a DNS zone that matches your `baseDomain`. Unlike standard deployments on Power VS which use IBM CIS for DNS, you must use IBM DNS for your DNS service. +You will also need to create an {ibm-name} DNS service containing a DNS zone that matches your `baseDomain`. Unlike standard deployments on Power VS which use {ibm-name} CIS for DNS, you must use {ibm-name} DNS for your DNS service. [id="private-clusters-limitations-ibm-power-virtual-server_{context}"] == Limitations -Private clusters on IBM Power Virtual Server are subject only to the limitations associated with the existing VPC that was used for cluster deployment. +Private clusters on {ibm-power-server-name} are subject only to the limitations associated with the existing VPC that was used for cluster deployment. diff --git a/modules/private-clusters-default.adoc b/modules/private-clusters-default.adoc index ac2644a9af..0d88e47680 100644 --- a/modules/private-clusters-default.adoc +++ b/modules/private-clusters-default.adoc @@ -62,7 +62,7 @@ ifdef::ibm-power-vs-private[] * Use existing networking that meets your requirements. endif::ibm-power-vs-private[] ifdef::ibm-cloud-private,ibm-power-vs-private[] -* Create a DNS zone using IBM Cloud DNS Services and specify it as the base domain of the cluster. For more information, see "Using IBM Cloud DNS Services to configure DNS resolution". +* Create a DNS zone using {ibm-cloud-name} DNS Services and specify it as the base domain of the cluster. For more information, see "Using {ibm-cloud-name} DNS Services to configure DNS resolution". endif::ibm-cloud-private,ibm-power-vs-private[] * Deploy from a machine that has access to: ** The API services for the cloud to which you provision. diff --git a/modules/quotas-and-limits-ibm-cloud.adoc b/modules/quotas-and-limits-ibm-cloud.adoc index 1da4aaf6be..da06b2c732 100644 --- a/modules/quotas-and-limits-ibm-cloud.adoc +++ b/modules/quotas-and-limits-ibm-cloud.adoc @@ -4,11 +4,11 @@ :_mod-docs-content-type: CONCEPT [id="quotas-and-limits-ibm-cloud_{context}"] -= Quotas and limits on IBM Cloud VPC += Quotas and limits on {ibm-cloud-title} -The {product-title} cluster uses a number of IBM Cloud VPC components, and the default quotas and limits affect your ability to install {product-title} clusters. If you use certain cluster configurations, deploy your cluster in certain regions, or run multiple clusters from your account, you might need to request additional resources for your IBM Cloud account. +The {product-title} cluster uses a number of {ibm-cloud-name} components, and the default quotas and limits affect your ability to install {product-title} clusters. If you use certain cluster configurations, deploy your cluster in certain regions, or run multiple clusters from your account, you might need to request additional resources for your {ibm-cloud-name} account. -For a comprehensive list of the default IBM Cloud VPC quotas and service limits, see IBM Cloud's documentation for link:https://cloud.ibm.com/docs/vpc?topic=vpc-quotas[Quotas and service limits]. +For a comprehensive list of the default {ibm-cloud-name} quotas and service limits, see {ibm-cloud-name}'s documentation for link:https://cloud.ibm.com/docs/vpc?topic=vpc-quotas[Quotas and service limits]. [discrete] == Virtual Private Cloud (VPC) @@ -26,7 +26,7 @@ By default, each cluster creates three application load balancers (ALBs): You can create additional `LoadBalancer` service objects to create additional ALBs. The default quota of VPC ALBs are 50 per region. To have more than 50 ALBs, you must increase this quota. -VPC ALBs are supported. Classic ALBs are not supported for IBM Cloud VPC. +VPC ALBs are supported. Classic ALBs are not supported for {ibm-cloud-name}. [discrete] == Floating IP address @@ -39,7 +39,7 @@ The default quota for a floating IP address is 20 addresses per availability zon * One floating IP address in the `us-east-2` secondary zone. * One floating IP address in the `us-east-3` secondary zone. -IBM Cloud VPC can support up to 19 clusters per region in an account. If you plan to have more than 19 default clusters, you must increase this quota. +{ibm-cloud-name} can support up to 19 clusters per region in an account. If you plan to have more than 19 default clusters, you must increase this quota. [discrete] == Virtual Server Instances (VSI) @@ -57,12 +57,12 @@ The following nodes are created: * Three `bx2-4x16` control plane nodes * Three `bx2-4x16` compute nodes -For more information, see IBM Cloud's documentation on link:https://cloud.ibm.com/docs/vpc?topic=vpc-profiles[supported profiles]. +For more information, see {ibm-cloud-name}'s documentation on link:https://cloud.ibm.com/docs/vpc?topic=vpc-profiles[supported profiles]. .VSI component quotas and limits [cols="2,2,4,2",options="header"] |=== -|VSI component |Default IBM Cloud VPC quota |Default cluster configuration |Maximum number of clusters +|VSI component |Default {ibm-cloud-name} quota |Default cluster configuration |Maximum number of clusters |vCPU |200 vCPUs per region @@ -80,9 +80,9 @@ For more information, see IBM Cloud's documentation on link:https://cloud.ibm.co |19 per region |=== -If you plan to exceed the resources stated in the table, you must increase your IBM Cloud account quota. +If you plan to exceed the resources stated in the table, you must increase your {ibm-cloud-name} account quota. [discrete] == Block Storage Volumes -For each VPC machine, a block storage device is attached for its boot volume. The default cluster configuration creates seven VPC machines, resulting in seven block storage volumes. Additional Kubernetes persistent volume claims (PVCs) of the IBM Cloud VPC storage class create additional block storage volumes. The default quota of VPC block storage volumes are 300 per region. To have more than 300 volumes, you must increase this quota. +For each VPC machine, a block storage device is attached for its boot volume. The default cluster configuration creates seven VPC machines, resulting in seven block storage volumes. Additional Kubernetes persistent volume claims (PVCs) of the {ibm-cloud-name} storage class create additional block storage volumes. The default quota of VPC block storage volumes are 300 per region. To have more than 300 volumes, you must increase this quota. diff --git a/modules/quotas-and-limits-ibm-power-vs.adoc b/modules/quotas-and-limits-ibm-power-vs.adoc index 58429f56f6..a7866d0c20 100644 --- a/modules/quotas-and-limits-ibm-power-vs.adoc +++ b/modules/quotas-and-limits-ibm-power-vs.adoc @@ -4,11 +4,11 @@ :_mod-docs-content-type: CONCEPT [id="quotas-and-limits-ibm-power-vs_{context}"] -= Quotas and limits on {ibmpowerProductName} Virtual Server += Quotas and limits on {ibm-power-server-title} -The {product-title} cluster uses several IBM Cloud and {ibmpowerProductName} Virtual Server components, and the default quotas and limits affect your ability to install {product-title} clusters. If you use certain cluster configurations, deploy your cluster in certain regions, or run multiple clusters from your account, you might need to request additional resources for your IBM Cloud VPC account. +The {product-title} cluster uses several {ibm-cloud-name} and {ibm-power-server-name} components, and the default quotas and limits affect your ability to install {product-title} clusters. If you use certain cluster configurations, deploy your cluster in certain regions, or run multiple clusters from your account, you might need to request additional resources for your {ibm-cloud-name} account. -For a comprehensive list of the default IBM Cloud VPC quotas and service limits, see the IBM Cloud documentation for link:https://cloud.ibm.com/docs/vpc?topic=vpc-quotas[Quotas and service limits]. +For a comprehensive list of the default {ibm-cloud-name} quotas and service limits, see the {ibm-cloud-name} documentation for link:https://cloud.ibm.com/docs/vpc?topic=vpc-quotas[Quotas and service limits]. [discrete] == Virtual Private Cloud @@ -25,12 +25,12 @@ By default, each cluster creates two application load balancers (ALBs): You can create additional `LoadBalancer` service objects to create additional ALBs. The default quota of VPC ALBs are 50 per region. To have more than 50 ALBs, you must increase this quota. -VPC ALBs are supported. Classic ALBs are not supported for {ibmpowerProductName} Virtual Server. +VPC ALBs are supported. Classic ALBs are not supported for {ibm-power-server-name}. [discrete] == Cloud connections -There is a limit of two cloud connections per {ibmpowerProductName} Virtual Server instance. It is recommended that you have only one cloud connection in your {ibmpowerProductName} Virtual Server instance to serve your cluster. +There is a limit of two cloud connections per {ibm-power-server-name} instance. It is recommended that you have only one cloud connection in your {ibm-power-server-name} instance to serve your cluster. [NOTE] ==== @@ -40,7 +40,7 @@ Cloud Connections are no longer supported in `dal10`. A transit gateway is used [discrete] == Dynamic Host Configuration Protocol Service -There is a limit of one Dynamic Host Configuration Protocol (DHCP) service per {ibmpowerProductName} Virtual Server instance. +There is a limit of one Dynamic Host Configuration Protocol (DHCP) service per {ibm-power-server-name} instance. [discrete] == Networking @@ -64,4 +64,4 @@ The following nodes are created: * Three control plane nodes * Three compute nodes -For more information, see link:https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server[Creating a Power Systems Virtual Server] in the IBM Cloud documentation. +For more information, see link:https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server[Creating a Power Systems Virtual Server] in the {ibm-cloud-name} documentation. diff --git a/modules/recommended-ibm-power-system-requirements.adoc b/modules/recommended-ibm-power-system-requirements.adoc index 362f4ee38e..0877e22915 100644 --- a/modules/recommended-ibm-power-system-requirements.adoc +++ b/modules/recommended-ibm-power-system-requirements.adoc @@ -5,7 +5,7 @@ :_mod-docs-content-type: CONCEPT [id="recommended-ibm-power-system-requirements_{context}"] -= Recommended IBM Power system requirements += Recommended {ibm-power-title} system requirements [discrete] == Hardware requirements @@ -15,16 +15,16 @@ [discrete] == Operating system requirements -* One instance of an IBM Power9 or Power10 processor-based system +* One instance of an {ibm-power-name}9 or {ibm-power-name}10 processor-based system -On your IBM Power instance, set up: +On your {ibm-power-name} instance, set up: * Three LPARs for {product-title} control plane machines * Two LPARs for {product-title} compute machines * One LPAR for the temporary {product-title} bootstrap machine [discrete] -== Disk storage for the IBM Power guest virtual machines +== Disk storage for the {ibm-power-title} guest virtual machines * Local storage, or storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) @@ -33,7 +33,7 @@ On your IBM Power instance, set up: * Dedicated physical adapter, or SR-IOV virtual function * Available by the Virtual I/O Server using Shared Ethernet Adapter -* Virtualized by the Virtual I/O Server using IBM vNIC +* Virtualized by the Virtual I/O Server using {ibm-name} vNIC [discrete] == Storage / main memory diff --git a/modules/registry-configuring-storage-baremetal.adoc b/modules/registry-configuring-storage-baremetal.adoc index 84903ed915..2fb21e4b33 100644 --- a/modules/registry-configuring-storage-baremetal.adoc +++ b/modules/registry-configuring-storage-baremetal.adoc @@ -35,10 +35,10 @@ ifndef::ibm-z,ibm-power[] = Configuring registry storage for bare metal and other manual installations endif::ibm-z,ibm-power[] ifdef::ibm-z[] -= Configuring registry storage for {ibmzProductName} += Configuring registry storage for {ibm-z-title} endif::ibm-z[] ifdef::ibm-power[] -= Configuring registry storage for IBM Power += Configuring registry storage for {ibm-power-title} endif::ibm-power[] As a cluster administrator, following installation you must configure your @@ -49,8 +49,8 @@ registry to use storage. * You have access to the cluster as a user with the `cluster-admin` role. * You have a cluster ifndef::ibm-z,ibm-power[that uses manually-provisioned {op-system-first} nodes, such as bare metal.] -ifdef::ibm-z[on {ibmzProductName}.] -ifdef::ibm-power[on IBM Power.] +ifdef::ibm-z[on {ibm-z-name}.] +ifdef::ibm-power[on {ibm-power-name}.] * You have provisioned persistent storage for your cluster, such as {rh-storage-first}. + [IMPORTANT] diff --git a/modules/rhcos-enabling-multipath-day-2.adoc b/modules/rhcos-enabling-multipath-day-2.adoc index fdce7c4b54..156468f4ad 100644 --- a/modules/rhcos-enabling-multipath-day-2.adoc +++ b/modules/rhcos-enabling-multipath-day-2.adoc @@ -14,7 +14,7 @@ Enabling multipathing during installation is supported and recommended for nodes ==== [IMPORTANT] ==== -On {ibmzProductName} and {linuxoneProductName}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}_. +On {ibm-z-name} and {ibm-linuxone-name}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}_. ==== // Add xref once it's allowed. diff --git a/modules/rhcos-enabling-multipath.adoc b/modules/rhcos-enabling-multipath.adoc index 6f222b67db..2938733eb8 100644 --- a/modules/rhcos-enabling-multipath.adoc +++ b/modules/rhcos-enabling-multipath.adoc @@ -16,7 +16,7 @@ In setups where any I/O to non-optimized paths results in I/O system errors, you [IMPORTANT] ==== -On {ibmzProductName} and {linuxoneProductName}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}_. +On {ibm-z-name} and {ibm-linuxone-name}, you can enable multipathing only if you configured your cluster for it during installation. For more information, see "Installing {op-system} and starting the {product-title} bootstrap process" in _Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}_. ==== // Add xref once it's allowed. diff --git a/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc b/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc index 8183951401..aba7e251e6 100644 --- a/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc +++ b/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc @@ -64,8 +64,8 @@ rules: EOD ---- <1> The Operator image. -* For {ibmpowerProductName}: `quay.io/ibm/operator-registry-ppc64le:release-4.9` -* For {ibmzProductName} and {linuxoneProductName}: `quay.io/ibm/operator-registry-s390x:release-4.8` +* For {ibm-power-name}: `quay.io/ibm/operator-registry-ppc64le:release-4.9` +* For {ibm-z-name} and {ibm-linuxone-name}: `quay.io/ibm/operator-registry-s390x:release-4.8` .Verification diff --git a/modules/serverless-gpu-resources-kn.adoc b/modules/serverless-gpu-resources-kn.adoc index 9953435ce6..887d5077b5 100644 --- a/modules/serverless-gpu-resources-kn.adoc +++ b/modules/serverless-gpu-resources-kn.adoc @@ -18,7 +18,7 @@ After GPU resources are enabled for your {product-title} cluster, you can specif ifndef::openshift-rosa[] [NOTE] ==== -Using NVIDIA GPU resources is not supported for {ibmzProductName} and {ibmpowerProductName}. +Using NVIDIA GPU resources is not supported for {ibm-z-name} and {ibm-power-name}. ==== endif::openshift-rosa[] diff --git a/modules/serverless-installing-cli-linux-rpm-package-manager.adoc b/modules/serverless-installing-cli-linux-rpm-package-manager.adoc index 3ea389090b..b6992c80ea 100644 --- a/modules/serverless-installing-cli-linux-rpm-package-manager.adoc +++ b/modules/serverless-installing-cli-linux-rpm-package-manager.adoc @@ -47,14 +47,14 @@ For {op-system-base-full}, you can install the Knative (`kn`) CLI as an RPM by u ---- ifndef::openshift-rosa[] + -* Linux on {ibmzProductName} and {linuxoneProductName} (s390x) +* Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x) + [source,terminal] ---- # subscription-manager repos --enable="openshift-serverless-1-for-rhel-8-s390x-rpms" ---- + -* Linux on {ibmpowerProductName} (ppc64le) +* Linux on {ibm-power-name} (ppc64le) + [source,terminal] ---- diff --git a/modules/serverless-installing-cli-linux.adoc b/modules/serverless-installing-cli-linux.adoc index b2f645d4f9..36205a4975 100644 --- a/modules/serverless-installing-cli-linux.adoc +++ b/modules/serverless-installing-cli-linux.adoc @@ -30,9 +30,9 @@ $ kn: No such file or directory * link:https://mirror.openshift.com/pub/openshift-v4/clients/serverless/latest/kn-linux-amd64.tar.gz[Linux (x86_64, amd64)] ifndef::openshift-rosa[] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/serverless/latest/kn-linux-s390x.tar.gz[Linux on {ibmzProductName} and {linuxoneProductName} (s390x)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/serverless/latest/kn-linux-s390x.tar.gz[Linux on {ibm-z-name} and {ibm-linuxone-name} (s390x)] -* link:https://mirror.openshift.com/pub/openshift-v4/clients/serverless/latest/kn-linux-ppc64le.tar.gz[Linux on {ibmpowerProductName} (ppc64le)] +* link:https://mirror.openshift.com/pub/openshift-v4/clients/serverless/latest/kn-linux-ppc64le.tar.gz[Linux on {ibm-power-name} (ppc64le)] endif::openshift-rosa[] -- + diff --git a/modules/serverless-kafka-developer.adoc b/modules/serverless-kafka-developer.adoc index 21275efd00..b5b8a993e7 100644 --- a/modules/serverless-kafka-developer.adoc +++ b/modules/serverless-kafka-developer.adoc @@ -14,7 +14,7 @@ THe Knative broker implementation for Apache Kafka provides integration options ifdef::openshift-enterprise[] [NOTE] ==== -The Knative broker implementation for Apache Kafka is not currently supported for {ibmzProductName} and {ibmpowerProductName}. +The Knative broker implementation for Apache Kafka is not currently supported for {ibm-z-name} and {ibm-power-name}. ==== endif::[] diff --git a/modules/serverless-rn-1-28-0.adoc b/modules/serverless-rn-1-28-0.adoc index 806af96dc4..fb9e9ac69f 100644 --- a/modules/serverless-rn-1-28-0.adoc +++ b/modules/serverless-rn-1-28-0.adoc @@ -45,7 +45,7 @@ In one of the following {ServerlessProductName} releases, secret filtering will [id="known-issues-1-28-0_{context}"] == Known issues -* Currently, runtimes for Python are not supported for {ServerlessProductName} Functions on IBM Power, IBM zSystems, and IBM(R) LinuxONE. +* Currently, runtimes for Python are not supported for {ServerlessProductName} Functions on {ibm-power-name}, {ibm-z-name} Systems, and {ibm-linuxone-name}. + Node.js, TypeScript, and Quarkus functions are supported on these architectures. diff --git a/modules/setting-up-bastion-for-sno.adoc b/modules/setting-up-bastion-for-sno.adoc index c873750114..7eb3768974 100644 --- a/modules/setting-up-bastion-for-sno.adoc +++ b/modules/setting-up-bastion-for-sno.adoc @@ -4,9 +4,9 @@ :_mod-docs-content-type: PROCEDURE [id="setting-up-bastion-for-sno_{context}"] -= Setting up basion for {sno} with {ibmpowerProductName} += Setting up basion for {sno} with {ibm-power-title} -Prior to installing {sno} on {ibmpowerProductName}, you must set up bastion. Setting up a bastion server for {sno} on {ibmpowerProductName} requires the configuration of the following services: +Prior to installing {sno} on {ibm-power-name}, you must set up bastion. Setting up a bastion server for {sno} on {ibm-power-name} requires the configuration of the following services: * PXE is used for the {sno} cluster installation. PXE requires the following services to be configured and run: ** DNS to define api, api-int, and *.apps diff --git a/modules/storage-persistent-storage-pv.adoc b/modules/storage-persistent-storage-pv.adoc index 7ff4e8f3af..4ea8f06338 100644 --- a/modules/storage-persistent-storage-pv.adoc +++ b/modules/storage-persistent-storage-pv.adoc @@ -59,8 +59,8 @@ ifndef::openshift-rosa[] - GCP Filestore endif::openshift-rosa[] ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] -- {ibmpowerProductName} Virtual Server Block -- IBM VPC Block +- {ibm-power-server-title} Block +- {ibm-name} VPC Block endif::openshift-enterprise,openshift-webscale,openshift-origin[] ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-aro[] - HostPath @@ -161,8 +161,8 @@ endif::openshift-rosa[] ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] //|GlusterFS | ✅ |✅ | ✅ | ✅ |HostPath | ✅ |✅ | - | - -|{ibmpowerProductName} Virtual Server Disk | ✅ |✅ | ✅ | ✅ -|IBM VPC Disk | ✅ |✅ | - | - +|{ibm-power-server-title} Disk | ✅ |✅ | ✅ | ✅ +|{ibm-name} VPC Disk | ✅ |✅ | - | - |iSCSI | ✅ | ✅ |✅ | - |Local volume | ✅ |✅ | - | - |NFS | ✅ | ✅ |✅ | ✅ diff --git a/modules/supported-platforms-for-openshift-clusters.adoc b/modules/supported-platforms-for-openshift-clusters.adoc index 03cc5ae2f6..d10a48eae2 100644 --- a/modules/supported-platforms-for-openshift-clusters.adoc +++ b/modules/supported-platforms-for-openshift-clusters.adoc @@ -13,7 +13,7 @@ In {product-title} {product-version}, you can install a cluster that uses instal * Amazon Web Services (AWS) * Bare metal * Google Cloud Platform (GCP) -* IBM Cloud® VPC +* {ibm-cloud-name} * Microsoft Azure * Microsoft Azure Stack Hub * Nutanix @@ -38,8 +38,8 @@ In {product-title} {product-version}, you can install a cluster that uses user-p * Azure Stack Hub * Bare metal * GCP -* {ibmpowerProductName} -* {ibmzProductName} or {linuxoneProductName} +* {ibm-power-name} +* {ibm-z-name} or {ibm-linuxone-name} * {rh-openstack} ** The latest {product-title} release supports both the latest {rh-openstack} long-life release and intermediate release. For complete {rh-openstack} release compatibility, see the link:https://access.redhat.com/articles/4679401[{product-title} on {rh-openstack} support matrix]. * VMware Cloud on AWS diff --git a/networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc b/networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc index 12505cdd5c..7832ceb375 100644 --- a/networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc +++ b/networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc @@ -11,7 +11,7 @@ The Kubernetes NMState Operator provides a Kubernetes API for performing state-d [IMPORTANT] ==== -Red Hat supports the Kubernetes NMState Operator in production environments on bare-metal, {ibmpowerProductName}, {ibmzProductName}, {linuxoneProductName}, VMware vSphere, and OpenStack installations. +Red Hat supports the Kubernetes NMState Operator in production environments on bare-metal, {ibm-power-name}, {ibm-z-name}, {ibm-linuxone-name}, VMware vSphere, and OpenStack installations. ==== Before you can use NMState with {product-title}, you must install the Kubernetes NMState Operator. diff --git a/networking/ovn_kubernetes_network_provider/configuring-ipsec-ovn.adoc b/networking/ovn_kubernetes_network_provider/configuring-ipsec-ovn.adoc index 59696b3dfb..703f3c2f12 100644 --- a/networking/ovn_kubernetes_network_provider/configuring-ipsec-ovn.adoc +++ b/networking/ovn_kubernetes_network_provider/configuring-ipsec-ovn.adoc @@ -12,7 +12,7 @@ IPsec is disabled by default. It can be enabled either during or after installin [NOTE] ==== -IPsec on IBM Cloud VPC supports only NAT-T. Using ESP is not supported. +IPsec on {ibm-cloud-name} supports only NAT-T. Using ESP is not supported. ==== Use the procedures in the following documentation to: diff --git a/networking/ovn_kubernetes_network_provider/converting-to-dual-stack.adoc b/networking/ovn_kubernetes_network_provider/converting-to-dual-stack.adoc index 5df1775c52..4c66a31f33 100644 --- a/networking/ovn_kubernetes_network_provider/converting-to-dual-stack.adoc +++ b/networking/ovn_kubernetes_network_provider/converting-to-dual-stack.adoc @@ -11,7 +11,7 @@ After converting to dual-stack, all newly created pods are dual-stack enabled. [NOTE] ==== -A dual-stack network is supported on clusters provisioned on bare metal, IBM Power, {ibmzProductName} infrastructure, and single node OpenShift clusters. +A dual-stack network is supported on clusters provisioned on bare metal, {ibm-power-name}, {ibm-z-name} infrastructure, and single node OpenShift clusters. ==== [NOTE] diff --git a/operators/admin/olm-restricted-networks.adoc b/operators/admin/olm-restricted-networks.adoc index 9849d4f960..88e36a82bd 100644 --- a/operators/admin/olm-restricted-networks.adoc +++ b/operators/admin/olm-restricted-networks.adoc @@ -48,7 +48,7 @@ Infrastructure features:: Disconnected [NOTE] ==== -If you are using OLM in a restricted network on {ibmzProductName}, you must have at least 12 GB allocated to the directory where you place your registry. +If you are using OLM in a restricted network on {ibm-z-name}, you must have at least 12 GB allocated to the directory where you place your registry. ==== include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc index 123bf3c92f..72e6c43565 100644 --- a/post_installation_configuration/cluster-tasks.adoc +++ b/post_installation_configuration/cluster-tasks.adoc @@ -15,7 +15,7 @@ You complete most of the cluster configuration and customization after you deplo [NOTE] ==== -If you install your cluster on {ibmzProductName}, not all features and functions are available. +If you install your cluster on {ibm-z-name}, not all features and functions are available. ==== You modify the configuration resources to configure the major features of the @@ -695,7 +695,7 @@ To allow the cluster to use the new credentials, you must update the secrets tha === Rotating cloud provider credentials with the Cloud Credential Operator utility // 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. +The Cloud Credential Operator (CCO) utility `ccoctl` supports updating secrets for clusters installed on {ibm-cloud-name}. //Rotating IBM Cloud credentials with ccoctl include::modules/refreshing-service-ids-ibm-cloud.adoc[leveloffset=+3] diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc index 4fffda4dee..a650183c6e 100644 --- a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc +++ b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY :context: creating-multi-arch-compute-nodes-ibm-power [id="creating-multi-arch-compute-nodes-ibm-power"] -= Creating a cluster with multi-architecture compute machines on {ibmpowerProductName} += Creating a cluster with multi-architecture compute machines on {ibm-power-title} include::_attributes/common-attributes.adoc[] toc::[] -To create a cluster with multi-architecture compute machines on {ibmpowerProductName} (`ppc64le`), you must have an existing single-architecture (`x86_64`) cluster. You can then add `ppc64le` compute machines to your {product-title} cluster. +To create a cluster with multi-architecture compute machines on {ibm-power-name} (`ppc64le`), you must have an existing single-architecture (`x86_64`) cluster. You can then add `ppc64le` compute machines to your {product-title} cluster. [IMPORTANT] ==== diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc index 16a5d1156b..bdc8341cc1 100644 --- a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc +++ b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY :context: creating-multi-arch-compute-nodes-ibm-z-kvm [id="creating-multi-arch-compute-nodes-ibm-z-kvm"] -= Creating a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} with {op-system-base} KVM += Creating a cluster with multi-architecture compute machines on {ibm-z-title} and {ibm-linuxone-title} with {op-system-base} KVM include::_attributes/common-attributes.adoc[] toc::[] -To create a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} (`s390x`) with {op-system-base} KVM, you must have an existing single-architecture `x86_64` cluster. You can then add `s390x` compute machines to your {product-title} cluster. +To create a cluster with multi-architecture compute machines on {ibm-z-name} and {ibm-linuxone-name} (`s390x`) with {op-system-base} KVM, you must have an existing single-architecture `x86_64` cluster. You can then add `s390x` compute machines to your {product-title} cluster. Before you can add `s390x` nodes to your cluster, you must upgrade your cluster to one that uses the multi-architecture payload. For more information on migrating to the multi-architecture payload, see xref:../../updating/updating_a_cluster/migrating-to-multi-payload.adoc#migrating-to-multi-payload[Migrating to a cluster with multi-architecture compute machines]. diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc index 399057790d..bf1b927521 100644 --- a/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc +++ b/post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY :context: creating-multi-arch-compute-nodes-ibm-z [id="creating-multi-arch-compute-nodes-ibm-z"] -= Creating a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} with z/VM += Creating a cluster with multi-architecture compute machines on {ibm-z-title} and {ibm-linuxone-title} with z/VM include::_attributes/common-attributes.adoc[] toc::[] -To create a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} (`s390x`) with z/VM, you must have an existing single-architecture `x86_64` cluster. You can then add `s390x` compute machines to your {product-title} cluster. +To create a cluster with multi-architecture compute machines on {ibm-z-name} and {ibm-linuxone-name} (`s390x`) with z/VM, you must have an existing single-architecture `x86_64` cluster. You can then add `s390x` compute machines to your {product-title} cluster. Before you can add `s390x` nodes to your cluster, you must upgrade your cluster to one that uses the multi-architecture payload. For more information on migrating to the multi-architecture payload, see xref:../../updating/updating_a_cluster/migrating-to-multi-payload.adoc#migrating-to-multi-payload[Migrating to a cluster with multi-architecture compute machines]. diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc index 51280d68da..8871b8fcd9 100644 --- a/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc +++ b/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc @@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[] toc::[] -An {product-title} cluster with multi-architecture compute machines is a cluster that supports compute machines with different architectures. Clusters with multi-architecture compute machines are available only on Amazon Web Services (AWS) or Microsoft Azure installer-provisioned infrastructures and bare metal, {ibmpowerProductName}, and {ibmzProductName} user-provisioned infrastructures with x86_64 control plane machines. +An {product-title} cluster with multi-architecture compute machines is a cluster that supports compute machines with different architectures. Clusters with multi-architecture compute machines are available only on Amazon Web Services (AWS) or Microsoft Azure installer-provisioned infrastructures and bare metal, {ibm-power-name}, and {ibm-z-name} user-provisioned infrastructures with x86_64 control plane machines. [NOTE] ==== @@ -32,11 +32,11 @@ To create a cluster with multi-architecture compute machines for various platfor * xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-bare-metal.adoc#creating-multi-arch-compute-nodes-bare-metal[Creating a cluster with multi-architecture compute machines on bare metal] -* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc#creating-multi-arch-compute-nodes-ibm-z[Creating a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} with z/VM] +* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc#creating-multi-arch-compute-nodes-ibm-z[Creating a cluster with multi-architecture compute machines on {ibm-z-name} and {ibm-linuxone-name} with z/VM] -* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc#creating-multi-arch-compute-nodes-ibm-z-kvm[Creating a cluster with multi-architecture compute machines on {ibmzProductName} and {linuxoneProductName} with {op-system-base} KVM] +* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z-kvm.adoc#creating-multi-arch-compute-nodes-ibm-z-kvm[Creating a cluster with multi-architecture compute machines on {ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM] -* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc#creating-multi-arch-compute-nodes-ibm-power[Creating a cluster with multi-architecture compute machines on {ibmpowerProductName}] +* xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc#creating-multi-arch-compute-nodes-ibm-power[Creating a cluster with multi-architecture compute machines on {ibm-power-name}] [IMPORTANT] ==== diff --git a/post_installation_configuration/ibmz-post-install.adoc b/post_installation_configuration/ibmz-post-install.adoc index 3cc021d99e..502eb81bd3 100644 --- a/post_installation_configuration/ibmz-post-install.adoc +++ b/post_installation_configuration/ibmz-post-install.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="post-install-configure-additional-devices-ibmz"] -= Configuring additional devices in an {ibmzProductName} or {linuxoneProductName} environment += Configuring additional devices in an {ibm-z-title} or {ibm-linuxone-title} environment include::_attributes/common-attributes.adoc[] :context: post-install-configure-additional-devices-ibmz toc::[] -After installing {product-title}, you can configure additional devices for your cluster in an {ibmzProductName} or {linuxoneProductName} environment, which is installed with z/VM. The following devices can be configured: +After installing {product-title}, you can configure additional devices for your cluster in an {ibm-z-name} or {ibm-linuxone-name} environment, which is installed with z/VM. The following devices can be configured: * Fibre Channel Protocol (FCP) host * FCP LUN @@ -17,7 +17,7 @@ You can configure devices by adding udev rules using the Machine Config Operator [NOTE] ==== -The procedures described here apply only to z/VM installations. If you have installed your cluster with {op-system-base} KVM on {ibmzProductName} or {linuxoneProductName} infrastructure, no additional configuration is needed inside the KVM guest after the devices were added to the KVM guests. However, both in z/VM and {op-system-base} KVM environments the next steps to configure the Local Storage Operator and Kubernetes NMState Operator need to be applied. +The procedures described here apply only to z/VM installations. If you have installed your cluster with {op-system-base} KVM on {ibm-z-name} or {ibm-linuxone-name} infrastructure, no additional configuration is needed inside the KVM guest after the devices were added to the KVM guests. However, both in z/VM and {op-system-base} KVM environments the next steps to configure the Local Storage Operator and Kubernetes NMState Operator need to be applied. ==== [role="_additional-resources"] @@ -36,7 +36,7 @@ include::modules/ibmz-configure-devices-manually.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -See link:https://www.ibm.com/docs/en/linux-on-systems?topic=linuxonibm/com.ibm.linux.z.ludd/ludd_c_perscfg.html[Persistent device configuration] in IBM Documentation. +See link:https://www.ibm.com/docs/en/linux-on-systems?topic=linuxonibm/com.ibm.linux.z.ludd/ludd_c_perscfg.html[Persistent device configuration] in {ibm-name} Documentation. [id="roce-network-cards"] == RoCE network Cards diff --git a/registry/configuring-registry-operator.adoc b/registry/configuring-registry-operator.adoc index 0c9722b312..8847c5063a 100644 --- a/registry/configuring-registry-operator.adoc +++ b/registry/configuring-registry-operator.adoc @@ -19,9 +19,9 @@ The Image Registry Operator installs a single instance of the {product-registry} ifndef::openshift-dedicated,openshift-rosa[] [NOTE] ==== -Storage is only automatically configured when you install an installer-provisioned infrastructure cluster on AWS, Azure, GCP, IBM, or OpenStack. +Storage is only automatically configured when you install an installer-provisioned infrastructure cluster on AWS, Azure, GCP, {ibm-name}, or OpenStack. -When you install or upgrade an installer-provisioned infrastructure cluster on AWS, Azure, GCP, IBM, or OpenStack, the Image Registry Operator sets the `spec.storage.managementState` parameter to `Managed`. If the `spec.storage.managementState` parameter is set to `Unmanaged`, the Image Registry Operator takes no action related to storage. +When you install or upgrade an installer-provisioned infrastructure cluster on AWS, Azure, GCP, {ibm-name}, or OpenStack, the Image Registry Operator sets the `spec.storage.managementState` parameter to `Managed`. If the `spec.storage.managementState` parameter is set to `Unmanaged`, the Image Registry Operator takes no action related to storage. ==== endif::openshift-dedicated,openshift-rosa[] diff --git a/scalability_and_performance/ibm-z-recommended-host-practices.adoc b/scalability_and_performance/ibm-z-recommended-host-practices.adoc index 2547aff535..ee1ab1fc01 100644 --- a/scalability_and_performance/ibm-z-recommended-host-practices.adoc +++ b/scalability_and_performance/ibm-z-recommended-host-practices.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: ASSEMBLY [id="ibm-z-recommended-host-practices"] -= Recommended host practices for {ibmzProductName} & {linuxoneProductName} environments += Recommended host practices for {ibm-z-title} & {ibm-linuxone-title} environments include::_attributes/common-attributes.adoc[] :context: ibm-z-recommended-host-practices toc::[] -This topic provides recommended host practices for {product-title} on {ibmzProductName} and {linuxoneProductName}. +This topic provides recommended host practices for {product-title} on {ibm-z-name} and {ibm-linuxone-name}. [NOTE] ==== @@ -15,7 +15,7 @@ The s390x architecture is unique in many aspects. Therefore, some recommendation [NOTE] ==== -Unless stated otherwise, these practices apply to both z/VM and {op-system-base-full} KVM installations on {ibmzProductName} and {linuxoneProductName}. +Unless stated otherwise, these practices apply to both z/VM and {op-system-base-full} KVM installations on {ibm-z-name} and {ibm-linuxone-name}. ==== include::modules/ibm-z-managing-cpu-overcommitment.adoc[leveloffset=+1] @@ -37,7 +37,7 @@ include::modules/ibm-z-boost-networking-performance-with-rfs.adoc[leveloffset=+1 [role="_additional-resources"] .Additional resources -* link:https://developer.ibm.com/tutorials/red-hat-openshift-on-ibm-z-tune-your-network-performance-with-rfs/[{product-title} on IBM Z: Tune your network performance with RFS] +* link:https://developer.ibm.com/tutorials/red-hat-openshift-on-ibm-z-tune-your-network-performance-with-rfs/[{product-title} on {ibm-z-name}: Tune your network performance with RFS] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-networking-configuration_tools#sect-Red_Hat_Enterprise_Linux-Performance_Tuning_Guide-Configuration_tools-Configuring_Receive_Flow_Steering_RFS[Configuring Receive Flow Steering (RFS)] @@ -48,9 +48,9 @@ include::modules/ibm-z-choose-networking-setup.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=openshift-performance#openshift_perf__ocp_eval[{product-title} on IBM Z - Performance Experiences, Hints and Tips] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=openshift-performance#openshift_perf__ocp_eval[{product-title} on {ibm-z-name} - Performance Experiences, Hints and Tips] -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=openshift-performance#openshift_perf__ocp_net[{product-title} on IBM Z Networking Performance] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=openshift-performance#openshift_perf__ocp_net[{product-title} on {ibm-z-name} Networking Performance] * xref:../nodes/scheduling/nodes-scheduler-node-affinity.adoc[Controlling pod placement on nodes using node affinity rules] @@ -68,6 +68,6 @@ include::modules/ibm-z-rhel-kvm-host-recommendations.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* link:https://www.ibm.com/docs/en/linux-on-systems?topic=v-kvm[Linux on IBM Z Performance Tuning for KVM] +* link:https://www.ibm.com/docs/en/linux-on-systems?topic=v-kvm[Linux on {ibm-z-name} Performance Tuning for KVM] -* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_virtualization/getting-started-with-virtualization-in-rhel-8-on-ibm-z_configuring-and-managing-virtualization[Getting started with virtualization on IBM Z] +* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_virtualization/getting-started-with-virtualization-in-rhel-8-on-ibm-z_configuring-and-managing-virtualization[Getting started with virtualization on {ibm-z-name}] diff --git a/security/compliance_operator/compliance-operator-release-notes.adoc b/security/compliance_operator/compliance-operator-release-notes.adoc index 3494526b9c..059ef25621 100644 --- a/security/compliance_operator/compliance-operator-release-notes.adoc +++ b/security/compliance_operator/compliance-operator-release-notes.adoc @@ -53,7 +53,7 @@ The following advisory is available for the OpenShift Compliance Operator 1.3.0: * The Defense Information Systems Agency Security Technical Implementation Guide (DISA-STIG) for {product-title} is now available from Compliance Operator 1.3.0. See xref:../../security/compliance_operator/co-scans/compliance-operator-supported-profiles.adoc#compliance-supported-profiles_compliance-operator-supported-profiles[Supported compliance profiles] for additional information. -* Compliance Operator 1.3.0 now supports {ibmpowerProductName} and {ibmzproductname} for NIST 800-53 Moderate-Impact Baseline for {product-title} platform and node profiles. +* Compliance Operator 1.3.0 now supports {ibm-power-name} and {ibm-z-name} for NIST 800-53 Moderate-Impact Baseline for {product-title} platform and node profiles. [id="compliance-operator-release-notes-1-2-0"] == OpenShift Compliance Operator 1.2.0 @@ -267,7 +267,7 @@ The following advisory is available for the OpenShift Compliance Operator 0.1.53 * Previously, the `ocp4-kubelet-enable-streaming-connections` rule contained an incorrect variable comparison, resulting in false positive scan results. Now, the Compliance Operator provides accurate scan results when setting `streamingConnectionIdleTimeout`. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2069891[*BZ#2069891*]) -* Previously, group ownership for `/etc/openvswitch/conf.db` was incorrect on IBM Z architectures, resulting in `ocp4-cis-node-worker-file-groupowner-ovs-conf-db` check failures. Now, the check is marked `NOT-APPLICABLE` on IBM Z architecture systems. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2072597[*BZ#2072597*]) +* Previously, group ownership for `/etc/openvswitch/conf.db` was incorrect on {ibm-z-name} architectures, resulting in `ocp4-cis-node-worker-file-groupowner-ovs-conf-db` check failures. Now, the check is marked `NOT-APPLICABLE` on {ibm-z-name} architecture systems. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2072597[*BZ#2072597*]) * Previously, the `ocp4-cis-scc-limit-container-allowed-capabilities` rule reported in a `FAIL` state due to incomplete data regarding the security context constraints (SCC) rules in the deployment. Now, the result is `MANUAL`, which is consistent with other checks that require human intervention. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2077916[*BZ#2077916*]) @@ -351,9 +351,9 @@ The following advisory is available for the OpenShift Compliance Operator 0.1.49 * The Compliance Operator is now supported on the following architectures: + -** IBM Power -** IBM Z -** IBM LinuxONE +** {ibm-power-name} +** {ibm-z-name} +** {ibm-linuxone-name} [id="compliance-operator-0-1-49-bug-fixes"] === Bug fixes @@ -366,7 +366,7 @@ The following advisory is available for the OpenShift Compliance Operator 0.1.49 * Previously, remediations using the `sshd jinja` macros were hard-coded to specific sshd configurations. As a result, the configurations were inconsistent with the content the rules were checking for and the check would fail. Now, the sshd configuration is parameterized and the rules apply successfully. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2049141[*BZ#2049141*]) -* Previously, the `ocp4-cluster-version-operator-verify-integrity` always checked the first entry in the Cluter Version Operator (CVO) history. As a result, the upgrade would fail in situations where subsequent versions of {product-name} would be verified. Now, the compliance check result for `ocp4-cluster-version-operator-verify-integrity` is able to detect verified versions and is accurate with the CVO history. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2053602[*BZ#2053602*]) +* Previously, the `ocp4-cluster-version-operator-verify-integrity` always checked the first entry in the Cluter Version Operator (CVO) history. As a result, the upgrade would fail in situations where subsequent versions of {product-title} would be verified. Now, the compliance check result for `ocp4-cluster-version-operator-verify-integrity` is able to detect verified versions and is accurate with the CVO history. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2053602[*BZ#2053602*]) * Previously, the `ocp4-api-server-no-adm-ctrl-plugins-disabled` rule did not check for a list of empty admission controller plugins. As a result, the rule would always fail, even if all admission plugins were enabled. Now, more robust checking of the `ocp4-api-server-no-adm-ctrl-plugins-disabled` rule accurately passes with all admission controller plugins enabled. (link:https://bugzilla.redhat.com/show_bug.cgi?id=2058631[*BZ#2058631*]) diff --git a/security/file_integrity_operator/file-integrity-operator-release-notes.adoc b/security/file_integrity_operator/file-integrity-operator-release-notes.adoc index e8cce8ad36..0a1554e587 100644 --- a/security/file_integrity_operator/file-integrity-operator-release-notes.adoc +++ b/security/file_integrity_operator/file-integrity-operator-release-notes.adoc @@ -76,7 +76,7 @@ The following advisory is available for the OpenShift File Integrity Operator 1. [id="file-integrity-operator-1-3-1-known-issues"] === Known Issues -In FIO 1.3.1, increasing nodes in {ibmzProductName} clusters might result in `Failed` File Integrity node status. For more information, see link:https://access.redhat.com/solutions/7028861[Adding nodes in IBM Power clusters can result in failed File Integrity node status]. +In FIO 1.3.1, increasing nodes in {ibm-z-name} clusters might result in `Failed` File Integrity node status. For more information, see link:https://access.redhat.com/solutions/7028861[Adding nodes in {ibm-power-name} clusters can result in failed File Integrity node status]. [id="file-integrity-operator-release-notes-1-2-1"] == OpenShift File Integrity Operator 1.2.1 @@ -134,8 +134,8 @@ The following advisory is available for the OpenShift File Integrity Operator 0. * The File Integrity Operator is now supported on the following architectures: + -** IBM Power -** IBM Z and LinuxONE +** {ibm-power-name} +** {ibm-z-name} and {ibm-linuxone-name} [id="file-integrity-operator-0-1-30-bug-fixes"] === Bug fixes diff --git a/service_mesh/v2x/ossm-extensions.adoc b/service_mesh/v2x/ossm-extensions.adoc index 33fd65500a..f2facd5a22 100644 --- a/service_mesh/v2x/ossm-extensions.adoc +++ b/service_mesh/v2x/ossm-extensions.adoc @@ -11,7 +11,7 @@ You can use WebAssembly extensions to add new features directly into the {SMProd ifndef::openshift-rosa[] [NOTE] ==== -WebAssembly extensions are not supported on {ibmzProductName} and {ibmpowerProductName}. +WebAssembly extensions are not supported on {ibm-z-name} and {ibm-power-name}. ==== endif::openshift-rosa[] diff --git a/service_mesh/v2x/preparing-ossm-installation.adoc b/service_mesh/v2x/preparing-ossm-installation.adoc index 1a92851ad2..f908ca4393 100644 --- a/service_mesh/v2x/preparing-ossm-installation.adoc +++ b/service_mesh/v2x/preparing-ossm-installation.adoc @@ -19,8 +19,8 @@ ifdef::openshift-enterprise[] ** xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[Install {product-title} {product-version} on user-provisioned AWS] ** xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Install {product-title} {product-version} on bare metal] ** xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[Install {product-title} {product-version} on vSphere] -** xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Install {product-title} {product-version} on {ibmzProductName} and {linuxoneProductName}] -** xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install {product-title} {product-version} on {ibmpowerProductName}] +** xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Install {product-title} {product-version} on {ibm-z-name} and {ibm-linuxone-name}] +** xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install {product-title} {product-version} on {ibm-power-name}] endif::[] * Install the version of the {product-title} command line utility (the `oc` client tool) that matches your {product-title} version and add it to your path. diff --git a/storage/container_storage_interface/persistent-storage-csi-ibm-powervs-block.adoc b/storage/container_storage_interface/persistent-storage-csi-ibm-powervs-block.adoc index 5c4325ea89..d65b1148ee 100644 --- a/storage/container_storage_interface/persistent-storage-csi-ibm-powervs-block.adoc +++ b/storage/container_storage_interface/persistent-storage-csi-ibm-powervs-block.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="persistent-storage-csi-ibm-powervs-block"] -= {ibmpowerProductName} Virtual Server Block CSI Driver Operator += {ibm-power-server-title} Block CSI Driver Operator include::_attributes/common-attributes.adoc[] :context: persistent-storage-csi-ibm-powervs-block @@ -9,23 +9,23 @@ toc::[] [id="persistent-storage-csi-ibm-powervs-block-introduction_{context}"] == Introduction -The IBM Power Virtual Server Block CSI Driver will be installed through IBM Power Virtual Server Block CSI Driver Operator and the operator is based on libarary-go. The OpenShift library-go is a collection of functions that allow us to build OpenShift operators easily. Most of the functionality of a CSI driver operator is already available there. The IBM Power Virtual Server Block CSI Driver Operator is installed by the cluster-storage-operator. The Cluster-storage-operator installs the IBM Power Virtual Server Block CSI Driver Operator if the Platform type is Power Virtual Servers. +The {ibm-power-server-name} Block CSI Driver will be installed through {ibm-power-server-name} Block CSI Driver Operator and the operator is based on libarary-go. The OpenShift library-go is a collection of functions that allow us to build OpenShift operators easily. Most of the functionality of a CSI driver operator is already available there. The {ibm-power-server-name} Block CSI Driver Operator is installed by the cluster-storage-operator. The Cluster-storage-operator installs the {ibm-power-server-name} Block CSI Driver Operator if the Platform type is Power Virtual Servers. [id="persistent-storage-csi-ibm-powervs-block-overview_{context}"] == Overview -{product-title} can provision persistent volumes (PVs) by using the Container Storage Interface (CSI) driver for {ibmpowerProductName} Virtual Server Block Storage. +{product-title} can provision persistent volumes (PVs) by using the Container Storage Interface (CSI) driver for {ibm-power-server-name} Block Storage. -:FeatureName: {ibmpowerProductName} Virtual Server Block CSI Driver Operator +:FeatureName: {ibm-power-server-title} Block CSI Driver Operator include::snippets/technology-preview.adoc[leveloffset=+1] Familiarity with xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] and xref:../../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-csi[configuring CSI volumes] is helpful when working with a CSI Operator and driver. -To create CSI-provisioned PVs that mount to {ibmpowerProductName} Virtual Server Block storage assets, {product-title} installs the {ibmpowerProductName} Virtual Server Block CSI Driver Operator and the {ibmpowerProductName} Virtual Server Block CSI driver by default in the `openshift-cluster-csi-drivers` namespace. +To create CSI-provisioned PVs that mount to {ibm-power-server-name} Block storage assets, {product-title} installs the {ibm-power-server-name} Block CSI Driver Operator and the {ibm-power-server-name} Block CSI driver by default in the `openshift-cluster-csi-drivers` namespace. -* The _{ibmpowerProductName} Virtual Server Block CSI Driver Operator_ provides two storage classes named `ibm-powervs-tier1` (default), and `ibm-powervs-tier3` for different tiers that you can use to create persistent volume claims (PVCs). The {ibmpowerProductName} Virtual Server Block CSI Driver Operator supports dynamic volume provisioning by allowing storage volumes to be created on demand, eliminating the need for cluster administrators to pre-provision storage. +* The _{ibm-power-server-name} Block CSI Driver Operator_ provides two storage classes named `ibm-powervs-tier1` (default), and `ibm-powervs-tier3` for different tiers that you can use to create persistent volume claims (PVCs). The {ibm-power-server-name} Block CSI Driver Operator supports dynamic volume provisioning by allowing storage volumes to be created on demand, eliminating the need for cluster administrators to pre-provision storage. -* The _{ibmpowerProductName} Virtual Server Block CSI driver_ allows you to create and mount {ibmpowerProductName} Virtual Server Block PVs. +* The _{ibm-power-server-name} Block CSI driver_ allows you to create and mount {ibm-power-server-name} Block PVs. include::modules/persistent-storage-csi-about.adoc[leveloffset=+1] 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 a3687897f2..227525de65 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 @@ -1,5 +1,5 @@ [id="persistent-storage-csi-ibm-vpc-block"] -= IBM VPC Block CSI Driver Operator += {ibm-title} VPC Block CSI Driver Operator include::_attributes/common-attributes.adoc[] :context: persistent-storage-csi-ibm-vpc-block @@ -7,15 +7,15 @@ toc::[] == Overview -{product-title} is capable of provisioning persistent volumes (PVs) using the Container Storage Interface (CSI) driver for IBM Virtual Private Cloud (VPC) Block Storage. +{product-title} is capable of provisioning persistent volumes (PVs) using the Container Storage Interface (CSI) driver for {ibm-name} Virtual Private Cloud (VPC) Block Storage. Familiarity with xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] and xref:../../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-csi[configuring CSI volumes] is recommended when working with a CSI Operator and driver. -To create CSI-provisioned PVs that mount to IBM VPC Block storage assets, {product-title} installs the IBM VPC Block CSI Driver Operator and the IBM VPC Block CSI driver by default in the `openshift-cluster-csi-drivers` namespace. +To create CSI-provisioned PVs that mount to {ibm-name} VPC Block storage assets, {product-title} installs the {ibm-name} VPC Block CSI Driver Operator and the {ibm-name} VPC Block CSI driver by default in the `openshift-cluster-csi-drivers` namespace. -* The _IBM VPC Block CSI Driver Operator_ provides three storage classes named `ibmc-vpc-block-10iops-tier` (default), `ibmc-vpc-block-5iops-tier`, and `ibmc-vpc-block-custom` for different tiers that you can use to create persistent volume claims (PVCs). The IBM VPC Block CSI Driver Operator supports dynamic volume provisioning by allowing storage volumes to be created on demand, eliminating the need for cluster administrators to pre-provision storage. You can disable this default storage class if desired (see xref:../../storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc#persistent-storage-csi-sc-manage[Managing the default storage class]). +* The _{ibm-name} VPC Block CSI Driver Operator_ provides three storage classes named `ibmc-vpc-block-10iops-tier` (default), `ibmc-vpc-block-5iops-tier`, and `ibmc-vpc-block-custom` for different tiers that you can use to create persistent volume claims (PVCs). The {ibm-name} VPC Block CSI Driver Operator supports dynamic volume provisioning by allowing storage volumes to be created on demand, eliminating the need for cluster administrators to pre-provision storage. You can disable this default storage class if desired (see xref:../../storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc#persistent-storage-csi-sc-manage[Managing the default storage class]). -* The _IBM VPC Block CSI driver_ enables you to create and mount IBM VPC Block PVs. +* The _{ibm-name} VPC Block CSI driver_ enables you to create and mount {ibm-name} VPC Block PVs. include::modules/persistent-storage-csi-about.adoc[leveloffset=+1] diff --git a/storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc b/storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc index 807a05fe10..b255c9a150 100644 --- a/storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc +++ b/storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc @@ -37,7 +37,7 @@ Managing the default storage classes is supported by the following Container Sto * xref:../../storage/container_storage_interface/persistent-storage-csi-gcp-pd.adoc#persistent-storage-csi-gcp-pd[Google Cloud Platform (GCP) Persistent Disk (PD)] -* xref:../../storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc#persistent-storage-csi-ibm-vpc-block[IBM VPC Block] +* xref:../../storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc#persistent-storage-csi-ibm-vpc-block[{ibm-name} VPC Block] * xref:../../storage/container_storage_interface/persistent-storage-csi-cinder.adoc#persistent-storage-csi-cinder[OpenStack Cinder] diff --git a/virt/install/preparing-cluster-for-virt.adoc b/virt/install/preparing-cluster-for-virt.adoc index 7d24af5ef2..4e0476038b 100644 --- a/virt/install/preparing-cluster-for-virt.adoc +++ b/virt/install/preparing-cluster-for-virt.adoc @@ -35,11 +35,11 @@ You can use the following platforms with {VirtProductName}: * Amazon Web Services bare metal instances. See xref:../../installing/installing_aws/installing-aws-customizations.html#installing-aws-customizations[Installing a cluster on AWS with customizations]. //See link:https://access.redhat.com/articles/6409731[Deploy {VirtProductName} on AWS metal instance types]. // seems outdated with references to OCS - remove? -* IBM Cloud Bare Metal Servers. See link:https://access.redhat.com/articles/6738731[Deploy {VirtProductName} on IBM Cloud Bare Metal nodes]. +* {ibm-cloud-name} Bare Metal Servers. See link:https://access.redhat.com/articles/6738731[Deploy {VirtProductName} on {ibm-cloud-name} Bare Metal nodes]. + -- ifdef::openshift-enterprise[] -:FeatureName: Installing OpenShift Virtualization on IBM Cloud Bare Metal Servers +:FeatureName: Installing OpenShift Virtualization on {ibm-cloud-name} Bare Metal Servers include::snippets/technology-preview.adoc[] :!FeatureName: endif::[] diff --git a/welcome/index.adoc b/welcome/index.adoc index 4533fc4e32..f9d867b98e 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -82,20 +82,20 @@ 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]**: On Google Cloud Platform (GCP) 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 {ibmcloudVPCRegProductName}]**: You can install {product-title} on {ibmcloudVPCProductName} on installer-provisioned infrastructure. +- **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}]**: You can install {product-title} on {ibm-cloud-name} 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 {ibmpowerRegProductName} Virtual Server]**: You can install {product-title} on {ibmpowerRegProductName} Virtual Server on installer-provisioned infrastructure. This is currently a Technology Preview feature only. +- **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]**: You can install {product-title} on {ibm-power-name} Virtual Server on installer-provisioned infrastructure. -- **xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install a cluster on {ibmpowerProductName}]**: You can install {product-title} on {ibmpowerProductName} on user-provisioned infrastructure. - -- **xref:../installing/installing_ibm_z/preparing-to-install-on-ibm-z.adoc#preparing-to-install-on-ibm[Install a cluster on {ibmzRegProductName} and {linuxoneProductName}]**: You can install {product-title} with z/VM or {op-system-base-full} KVM on {ibmzProductName} and {linuxoneProductName} on user-provisioned infrastructure. +- **xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install a cluster on {ibm-power-name}]**: You can install {product-title} on {ibm-power-name} on user-provisioned infrastructure. endif::openshift-origin[] - **xref:../installing/installing_vsphere/preparing-to-install-on-vsphere.adoc#preparing-to-install-on-vsphere[Install a cluster on VMware vSphere]**: On supported versions of VMware vSphere, you can install {product-title} on installer-provisioned infrastructure or user-provisioned infrastructure. -- **xref:../installing/installing_bare_metal/preparing-to-install-on-bare-metal.adoc#preparing-to-install-on-bare-metal[Install a cluster on bare metal]**: On bare metal, you can install {product-title} on installer-provisioned infrastructure or user-provisioned infrastructure. If none of the available platform and cloud provider deployment options meet your needs, consider using the bare metal user-provisioned infrastructure route. +ifndef::openshift-origin[] +- **xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Install a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} with z/VM on {ibm-z-name} and {ibm-linuxone-name} on user-provisioned infrastructure. -- **xref:../installing/installing_openstack/preparing-to-install-on-openstack.adoc#preparing-to-install-on-openstack[Install a cluster on {rh-openstack-first}]**: On {rh-openstack}, you can install {product-title} on installer-provisioned infrastructure or user-provisioned infrastructure. +- **xref:../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Install a cluster with RHEL KVM on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} with RHEL KVM on {ibm-z-name} and {ibm-linuxone-name} on user-provisioned infrastructure. +endif::openshift-origin[] - **xref:../installing/installing_nutanix/preparing-to-install-on-nutanix.adoc#preparing-to-install-nutanix[Install a cluster on Nutanix]**: On Nutanix, you can install a cluster on your {product-title} on installer-provisioned infrastructure. @@ -114,7 +114,7 @@ user-provisioned infrastructure on xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[GCP], xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], -xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{ibmzProductName} and {linuxoneProductName} with z/VM], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibmzProductName} and {linuxoneProductName} with RHEL KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[{ibmpowerProductName}], +xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[{ibm-z-name} and {ibm-linuxone-name} with z/VM], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with RHEL KVM], 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. @@ -146,7 +146,7 @@ internet access, you can install a private cluster on xref:../installing/installing_aws/installing-aws-private.adoc#installing-aws-private[AWS], xref:../installing/installing_azure/installing-azure-private.adoc#installing-aws-private[Azure], xref:../installing/installing_gcp/installing-gcp-private.adoc#installing-gcp-private[GCP], or -xref:../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[{ibmcloudVPCRegProductName}]. Internet access is still required to access the cloud APIs and installation media. +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-troubleshooting.adoc#installing-troubleshooting[Check installation logs]**: Access installation logs to evaluate issues that occur during {product-title} installation. diff --git a/welcome/oke_about.adoc b/welcome/oke_about.adoc index 98082a0f55..ab38c8303f 100644 --- a/welcome/oke_about.adoc +++ b/welcome/oke_about.adoc @@ -98,7 +98,7 @@ and {product-title} in the following table: | | Yes -2+h|Embedded Component of IBM Cloud Pak and RHT MW Bundles +2+h|Embedded Component of {ibm-cloud-name} Pak and RHT MW Bundles | | Yes @@ -280,7 +280,7 @@ s| Feature s| {oke} s| {product-title} s| Operator name | IPv6 Single and Dual Stack | Included | Included | N/A | CNI Plugin ISV Compatibility | Included | Included | N/A | CSI Plugin ISV Compatibility | Included | Included | N/A -| RHT and IBM middleware à la carte purchases (not included in {product-title} or {oke}) | Included | Included | N/A +| RHT and {ibm-name} middleware à la carte purchases (not included in {product-title} or {oke}) | Included | Included | N/A | ISV or Partner Operator and Container Compatibility (not included in {product-title} or {oke}) | Included | Included | N/A | Embedded OperatorHub | Included | Included | N/A | Embedded Marketplace | Included | Included | N/A @@ -301,7 +301,7 @@ s| Feature s| {oke} s| {product-title} s| Operator name | Red Hat OpenShift Serverless | Not Included | Included | OpenShift Serverless Operator | Web Terminal provided by Red Hat | Not Included | Included | Web Terminal Operator | Red Hat OpenShift Pipelines Operator | Not Included | Included | OpenShift Pipelines Operator -| Embedded Component of IBM Cloud Pak and RHT MW Bundles | Not Included | Included | N/A +| Embedded Component of {ibm-cloud-name} Pak and RHT MW Bundles | Not Included | Included | N/A | Red Hat OpenShift GitOps | Not Included | Included | OpenShift GitOps | {openshift-dev-spaces-productname} | Not Included | Included | {openshift-dev-spaces-productname} | {openshift-local-productname} | Not Included | Included | N/A @@ -316,7 +316,7 @@ s| Feature s| {oke} s| {product-title} s| Operator name | Red Hat Build of Quarkus | Not included | Included | N/A | Kourier Ingress Controller | Not included | Included | N/A | RHT Middleware Bundles Sub Compatibility (not included in {product-title}) | Not included | Included | N/A -| IBM Cloud Pak Sub Compatibility (not included in {product-title}) | Not included | Included | N/A +| {ibm-cloud-name} Pak Sub Compatibility (not included in {product-title}) | Not included | Included | N/A | OpenShift Do (`odo`) | Not included | Included | N/A | Source to Image and Tekton Builders | Not included | Included | N/A | OpenShift Serverless FaaS | Not included | Included | N/A