From 1681784dcbc50c6725e3d000e4a3464a8f66259f Mon Sep 17 00:00:00 2001 From: Alisha Prabhu Date: Mon, 31 Jan 2022 19:40:57 +0530 Subject: [PATCH] PR to update - IBM Power Systems to IBM Power --- _topic_maps/_topic_map.yml | 10 +++++----- .../working_with_helm_charts/installing-helm.adoc | 2 +- .../installing_ibm_power/installing-ibm-power.adoc | 7 ++++--- .../installing-restricted-networks-ibm-power.adoc | 7 ++++--- .../preparing-to-install-on-ibm-power.adoc | 10 +++++----- modules/installation-bare-metal-config-yaml.adoc | 4 ++-- modules/minimum-ibm-power-system-requirements.adoc | 2 +- modules/olm-pruning-index-image.adoc | 2 +- modules/openshift-cluster-maximums-environment.adoc | 2 +- modules/registry-configuring-storage-baremetal.adoc | 4 ++-- ...ploying-a-postgresql-database-operator-power-z.adoc | 2 +- modules/serverless-gpu-resources-kn.adoc | 2 +- .../serverless-installing-cli-linux-ibm-power-rpm.adoc | 2 +- ...verless-installing-cli-linux-ibm-power-tarball.adoc | 2 +- .../supported-platforms-for-openshift-clusters.adoc | 2 +- serverless/admin_guide/serverless-kafka-admin.adoc | 2 +- serverless/develop/serverless-kafka-developer.adoc | 2 +- service_mesh/v2x/preparing-ossm-installation.adoc | 2 +- welcome/index.adoc | 4 ++-- 19 files changed, 36 insertions(+), 34 deletions(-) diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 7af86ca8bb..2715161a4b 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -262,15 +262,15 @@ Topics: File: installing-ibm-z-kvm - Name: Restricted network IBM Z installation with RHEL KVM File: installing-restricted-networks-ibm-z-kvm -- Name: Installing on IBM Power Systems +- Name: Installing on IBM Power Dir: installing_ibm_power Distros: openshift-enterprise Topics: - - Name: Preparing to install on IBM Power Systems + - Name: Preparing to install on IBM Power File: preparing-to-install-on-ibm-power - - Name: Installing a cluster on IBM Power Systems + - Name: Installing a cluster on IBM Power File: installing-ibm-power - - Name: Restricted network IBM Power Systems installation + - Name: Restricted network IBM Power installation File: installing-restricted-networks-ibm-power - Name: Installing on OpenStack Dir: installing_openstack @@ -1591,7 +1591,7 @@ Topics: File: installing-sbo - Name: Getting started with service binding File: getting-started-with-service-binding - - Name: Getting started with service binding on IBM Power Systems, IBM Z, and LinuxONE + - Name: Getting started with service binding on IBM Power, IBM Z, and LinuxONE File: getting-started-with-service-binding-ibm-power-ibm-z - Name: Exposing binding data from a service File: exposing-binding-data-from-a-service diff --git a/applications/working_with_helm_charts/installing-helm.adoc b/applications/working_with_helm_charts/installing-helm.adoc index c72a38f455..906828370f 100644 --- a/applications/working_with_helm_charts/installing-helm.adoc +++ b/applications/working_with_helm_charts/installing-helm.adoc @@ -30,7 +30,7 @@ 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-s390x -o /usr/local/bin/helm ---- -* Linux on IBM Power Systems (ppc64le) +* Linux on IBM Power (ppc64le) + [source,terminal] ---- diff --git a/installing/installing_ibm_power/installing-ibm-power.adoc b/installing/installing_ibm_power/installing-ibm-power.adoc index 58d194e36d..f7ece1c206 100644 --- a/installing/installing_ibm_power/installing-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-ibm-power.adoc @@ -1,12 +1,13 @@ +:_content-type: ASSEMBLY [id="installing-ibm-power"] -= Installing a cluster on IBM Power Systems += Installing a cluster on IBM Power include::modules/common-attributes.adoc[] :context: installing-ibm-power toc::[] In {product-title} version {product-version}, you can install a cluster on -IBM Power Systems infrastructure that you provision. +IBM Power infrastructure that you provision. [IMPORTANT] ==== @@ -72,7 +73,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 IBM Power Systems 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 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 14304f78a6..ba19285151 100644 --- a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc @@ -1,12 +1,13 @@ +:_content-type: ASSEMBLY [id="installing-restricted-networks-ibm-power"] -= Installing a cluster on IBM Power Systems in a restricted network += Installing a cluster on IBM Power in a restricted network include::modules/common-attributes.adoc[] :context: installing-restricted-networks-ibm-power toc::[] In {product-title} version {product-version}, you can install a cluster on -IBM Power Systems infrastructure that you provision in a restricted network. +IBM Power infrastructure that you provision in a restricted network. [IMPORTANT] ==== @@ -80,7 +81,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 IBM Power Systems 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 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 4ce1612530..cf674253e4 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,5 +1,5 @@ [id="preparing-to-install-on-ibm-power"] -= Preparing to install on IBM Power Systems += Preparing to install on IBM Power include::modules/common-attributes.adoc[] :context: preparing-to-install-on-ibm-power @@ -12,10 +12,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 Systems +== Choosing a method to install {product-title} on IBM Power -You can install a cluster on IBM Power Systems infrastructure that you provision, by using one of the following methods: +You can install a cluster on IBM Power 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 Systems]**: You can install {product-title} on IBM Power Systems infrastructure that you provision. +* **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-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[Installing a cluster on IBM Power Systems in a restricted network]**: You can install {product-title} on IBM Power Systems 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 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. diff --git a/modules/installation-bare-metal-config-yaml.adoc b/modules/installation-bare-metal-config-yaml.adoc index 00eb51b1c1..70d285f8b1 100644 --- a/modules/installation-bare-metal-config-yaml.adoc +++ b/modules/installation-bare-metal-config-yaml.adoc @@ -52,7 +52,7 @@ ifdef::ibm-z,ibm-z-kvm[] = Sample `install-config.yaml` file for IBM Z endif::ibm-z,ibm-z-kvm[] ifdef::ibm-power[] -= Sample `install-config.yaml` file for IBM Power Systems += Sample `install-config.yaml` file for IBM Power endif::ibm-power[] ifdef::agnostic[] = Sample `install-config.yaml` file for other platforms @@ -263,7 +263,7 @@ load balancers and routers to manage the traffic. configuration variables for ifndef::ibm-z,ibm-z-kvm,ibm-power,rhv[your platform.] ifdef::ibm-z,ibm-z-kvm[IBM Z infrastructure.] -ifdef::ibm-power[IBM Power Systems infrastructure.] +ifdef::ibm-power[IBM Power infrastructure.] ifdef::rhv[RHV infrastructure.] ifndef::openshift-origin[] + diff --git a/modules/minimum-ibm-power-system-requirements.adoc b/modules/minimum-ibm-power-system-requirements.adoc index 2f73817701..719a27483a 100644 --- a/modules/minimum-ibm-power-system-requirements.adoc +++ b/modules/minimum-ibm-power-system-requirements.adoc @@ -4,7 +4,7 @@ // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc [id="minimum-ibm-power-system-requirements_{context}"] -= Minimum IBM Power Systems requirements += Minimum IBM Power requirements You can install {product-title} version {product-version} on the following IBM hardware: diff --git a/modules/olm-pruning-index-image.adoc b/modules/olm-pruning-index-image.adoc index 8ab1f3ef39..c20dca47f8 100644 --- a/modules/olm-pruning-index-image.adoc +++ b/modules/olm-pruning-index-image.adoc @@ -126,7 +126,7 @@ $ opm index prune \ ---- <1> Index to prune. <2> Comma-separated list of packages to keep. -<3> Required only for IBM Power Systems and IBM Z 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 and IBM Z 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/openshift-cluster-maximums-environment.adoc b/modules/openshift-cluster-maximums-environment.adoc index 119d708aed..e5b995c7fd 100644 --- a/modules/openshift-cluster-maximums-environment.adoc +++ b/modules/openshift-cluster-maximums-environment.adoc @@ -57,7 +57,7 @@ AWS cloud platform: 5. Cluster is scaled in iterations and performance and scalability tests are executed at the specified node counts. -- -IBM Power Systems platform: +IBM Power platform: [options="header",cols="6*"] |=== diff --git a/modules/registry-configuring-storage-baremetal.adoc b/modules/registry-configuring-storage-baremetal.adoc index 619a822814..90c2fdc9a0 100644 --- a/modules/registry-configuring-storage-baremetal.adoc +++ b/modules/registry-configuring-storage-baremetal.adoc @@ -29,7 +29,7 @@ ifdef::ibm-z[] = Configuring registry storage for IBM Z endif::ibm-z[] ifdef::ibm-power[] -= Configuring registry storage for IBM Power Systems += Configuring registry storage for IBM Power endif::ibm-power[] As a cluster administrator, following installation you must configure your @@ -41,7 +41,7 @@ registry to use storage. * 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 IBM Z.] -ifdef::ibm-power[on IBM Power Systems.] +ifdef::ibm-power[on IBM Power.] ifndef::ibm-z[* You have provisioned persistent storage for your cluster, such as Red Hat OpenShift Container Storage.] ifdef::ibm-z[* You have provisioned persistent storage for your cluster.] + 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 85d786aa26..785504509a 100644 --- a/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc +++ b/modules/sbo-deploying-a-postgresql-database-operator-power-z.adoc @@ -61,7 +61,7 @@ rules: EOD ---- <1> The Operator image. -* For IBM Power Systems: `quay.io/ibm/operator-registry-ppc64le:release-4.9` +* For IBM Power: `quay.io/ibm/operator-registry-ppc64le:release-4.9` * For IBM Z and LinuxONE: `quay.io/ibm/operator-registry-s390x:release-4.8` After the operator is installed, list the operator subscriptions in `openshift-operators` namespace: diff --git a/modules/serverless-gpu-resources-kn.adoc b/modules/serverless-gpu-resources-kn.adoc index c8cc556cab..27dc4484fd 100644 --- a/modules/serverless-gpu-resources-kn.adoc +++ b/modules/serverless-gpu-resources-kn.adoc @@ -9,7 +9,7 @@ After GPU resources are enabled for your {product-title} cluster, you can specif [NOTE] ==== -Using NVIDIA GPU resources is not supported for IBM Z and IBM Power Systems. +Using NVIDIA GPU resources is not supported for IBM Z and IBM Power. ==== .Procedure diff --git a/modules/serverless-installing-cli-linux-ibm-power-rpm.adoc b/modules/serverless-installing-cli-linux-ibm-power-rpm.adoc index bd77bdc215..353100e8cf 100644 --- a/modules/serverless-installing-cli-linux-ibm-power-rpm.adoc +++ b/modules/serverless-installing-cli-linux-ibm-power-rpm.adoc @@ -1,5 +1,5 @@ [id="installing-cli-linux-ibm-power-rpm_{context}"] -= Installing the Knative CLI for Linux on IBM Power Systems using an RPM += Installing the Knative CLI for Linux on IBM Power using an RPM For {op-system-base-full}, you can install the Knative CLI (`kn`) as an RPM if you have an active {product-title} subscription on your Red Hat account. diff --git a/modules/serverless-installing-cli-linux-ibm-power-tarball.adoc b/modules/serverless-installing-cli-linux-ibm-power-tarball.adoc index 455549293e..34d14addc8 100644 --- a/modules/serverless-installing-cli-linux-ibm-power-tarball.adoc +++ b/modules/serverless-installing-cli-linux-ibm-power-tarball.adoc @@ -1,5 +1,5 @@ [id="installing-cli-linux-ibm-power-tarball_{context}"] -= Installing the Knative CLI for Linux on IBM Power Systems += Installing the Knative CLI for Linux on IBM Power For Linux distributions, you can download the Knative CLI (`kn`) directly as a `tar.gz` archive. diff --git a/modules/supported-platforms-for-openshift-clusters.adoc b/modules/supported-platforms-for-openshift-clusters.adoc index d0b24bb757..0f910d3327 100644 --- a/modules/supported-platforms-for-openshift-clusters.adoc +++ b/modules/supported-platforms-for-openshift-clusters.adoc @@ -40,7 +40,7 @@ In {product-title} {product-version}, you can install a cluster that uses user-p * VMware Cloud on AWS * Bare metal * IBM Z or LinuxONE -* IBM Power Systems +* IBM Power Depending on the supported cases for the platform, installations on user-provisioned infrastructure allow you to run machines with full internet access, place your cluster behind a proxy, or perform a _restricted network installation_. In a restricted network installation, you can download the images that are required to install a cluster, place them in a mirror registry, and use that data to install your cluster. While you require internet access to pull images for platform containers, with a restricted network installation on vSphere or bare metal infrastructure, your cluster machines do not require direct internet access. diff --git a/serverless/admin_guide/serverless-kafka-admin.adoc b/serverless/admin_guide/serverless-kafka-admin.adoc index fb38c4fe16..426d387c95 100644 --- a/serverless/admin_guide/serverless-kafka-admin.adoc +++ b/serverless/admin_guide/serverless-kafka-admin.adoc @@ -16,7 +16,7 @@ The `KnativeKafka` CR provides users with additional options, such as: [NOTE] ==== -Knative Kafka is not currently supported for IBM Z and IBM Power Systems. +Knative Kafka is not currently supported for IBM Z and IBM Power. ==== include::modules/serverless-install-kafka-odc.adoc[leveloffset=+1] diff --git a/serverless/develop/serverless-kafka-developer.adoc b/serverless/develop/serverless-kafka-developer.adoc index d103494bb4..55669d166c 100644 --- a/serverless/develop/serverless-kafka-developer.adoc +++ b/serverless/develop/serverless-kafka-developer.adoc @@ -16,7 +16,7 @@ Knative Kafka provides additional options, such as: [NOTE] ==== -Knative Kafka is not currently supported for IBM Z and IBM Power Systems. +Knative Kafka is not currently supported for IBM Z and IBM Power. ==== include::modules/serverless-kafka-event-delivery.adoc[leveloffset=+1] diff --git a/service_mesh/v2x/preparing-ossm-installation.adoc b/service_mesh/v2x/preparing-ossm-installation.adoc index 03237d3494..b1b32292e3 100644 --- a/service_mesh/v2x/preparing-ossm-installation.adoc +++ b/service_mesh/v2x/preparing-ossm-installation.adoc @@ -17,7 +17,7 @@ Before you can install {ProductName}, you must subscribe to {product-title} and ** 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 IBM Z and LinuxONE] -** xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install {product-title} {product-version} on IBM Power Systems] +** xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install {product-title} {product-version} on IBM Power] + * 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. ** If you are using {product-title} {product-version}, see xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-about-cli_cli-developer-commands[About the OpenShift CLI]. diff --git a/welcome/index.adoc b/welcome/index.adoc index 1bd6dc836a..2a93d0ea1c 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -62,7 +62,7 @@ ifndef::openshift-origin[] - **xref:../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Install a cluster with RHEL KVM on IBM Z and LinuxONE]**: You can install {product-title} with RHEL KVM on IBM Z and LinuxONE on user-provisioned infrastructure. -- **xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install a cluster on IBM Power Systems]**: You can install {product-title} on IBM Power Systems on user-provisioned infrastructure. +- **xref:../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[Install a cluster on IBM Power]**: You can install {product-title} on IBM Power on user-provisioned infrastructure. endif::openshift-origin[] - **xref:../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[Install an installer-provisioned cluster on bare metal]**: You can install {product-title} on bare metal with an installer-provisioned architecture. @@ -91,7 +91,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[IBM Z and LinuxONE with z/VM], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[IBM Z and LinuxONE with RHEL KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[IBM Power Systems], +xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[IBM Z and LinuxONE with z/VM], xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[IBM Z and LinuxONE with RHEL KVM], xref:../installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc#installing-restricted-networks-ibm-power[IBM Power], or xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal] does not have full access to the internet, then