Merge pull request #67323 from dfitzmau/ibm-name-clean-up

Author: sheriff-rh

_attributes/common-attributes.adoc

@@ -208,17 +208,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
+: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
-: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

_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

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

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

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]
 ----

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]^

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]

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]

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}.
 
 ====
 

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