openshift · maxwelldb · Jun 24, 2020 · Jun 17, 2020
diff --git a/modules/apis.adoc b/modules/apis.adoc
@@ -6609,7 +6609,7 @@ The following table describes the parameters for CinderPersistentVolumeSource ob
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | SecretReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack-first}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -9564,7 +9564,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -12827,7 +12827,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -15524,7 +15524,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -19325,7 +19325,7 @@ The following table describes the parameters for LoadBalancerIngress object:
 | Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
 | `ip`
 | string
-| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
+| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
 |===
 ==== SessionAffinityConfig [v1/core]
 
@@ -26811,7 +26811,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -29680,7 +29680,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -32631,7 +32631,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -35920,7 +35920,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -38846,7 +38846,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -45542,7 +45542,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -48377,7 +48377,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -60002,7 +60002,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -62897,7 +62897,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -65004,7 +65004,7 @@ The following table describes the parameters for LoadBalancerIngress object:
 | Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
 | `ip`
 | string
-| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
+| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
 |===
 ==== IngressTLS [v1beta1/extensions]
 
@@ -68700,7 +68700,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -75699,7 +75699,7 @@ The following table describes the parameters for LoadBalancerIngress object:
 | Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
 | `ip`
 | string
-| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
+| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
 |===
 ==== IngressTLS [v1beta1/networking]
 
@@ -90729,7 +90729,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -92819,7 +92819,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -94915,7 +94915,7 @@ The following table describes the parameters for CinderVolumeSource object:
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | LocalObjectReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
@@ -99258,7 +99258,7 @@ The following table describes the parameters for CinderPersistentVolumeSource ob
 | Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md
 | `secretRef`
 | SecretReference
-| Optional: points to a secret object containing parameters used to connect to OpenStack.
+| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
 | `volumeID`
 | string
 | volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md

diff --git a/modules/cluster-storage-operator.adoc b/modules/cluster-storage-operator.adoc
@@ -24,6 +24,6 @@ No configuration is required.
 [discrete]
 == Notes
 
-* The Cluster Storage Operator supports Amazon Web Services (AWS) and Red Hat OpenStack.
+* The Cluster Storage Operator supports Amazon Web Services (AWS) and {rh-openstack-first}.
 * The created storage class can be made non-default by editing its annotation, but
-the storage class cannot be deleted as long as the Operator runs.
+the storage class cannot be deleted as long as the Operator runs.
diff --git a/modules/cnf-understanding-low-latency.adoc b/modules/cnf-understanding-low-latency.adoc
@@ -20,7 +20,7 @@ Many of the deployed applications in the Telco space require low latency that
 can only tolerate zero packet loss. Tuning for zero packet loss helps mitigate
 the inherent issues that degrade network performance. For more information, see
 link:https://www.redhat.com/en/blog/tuning-zero-packet-loss-red-hat-openstack-platform-part-1[Tuning
-for Zero Packet Loss in Red Hat OpenStack Platform].
+for Zero Packet Loss in {rh-openstack-first}].
 
 The Edge computing initiative also comes in to play for reducing latency rates.
 Think of it as literally being on the edge of the cloud and closer to the user.

diff --git a/modules/dynamic-provisioning-available-plugins.adoc b/modules/dynamic-provisioning-available-plugins.adoc
@@ -17,7 +17,7 @@ configured provider's API to create new storage resources:
 |Provisioner plug-in name
 |Notes
 
-|OpenStack Cinder
+|{rh-openstack-first} Cinder
 |`kubernetes.io/cinder`
 |
 

diff --git a/modules/dynamic-provisioning-cinder-definition.adoc b/modules/dynamic-provisioning-cinder-definition.adoc
@@ -3,7 +3,7 @@
 // * storage/dynamic-provisioning.adoc
 
 [id="openstack-cinder-storage-class_{context}"]
-= OpenStack Cinder object definition
+= {rh-openstack} Cinder object definition
 
 .cinder-storageclass.yaml
 [source,yaml]

diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc
@@ -94,7 +94,7 @@ ifdef::gcp[]
 Google Cloud Platform (GCP).
 endif::gcp[]
 ifdef::osp[]
-OpenStack.
+{rh-openstack-first}.
 endif::osp[]
 ifdef::rhv[]
 {rh-virtualization-first}.

diff --git a/modules/installation-osp-about-kuryr.adoc b/modules/installation-osp-about-kuryr.adoc
@@ -6,16 +6,16 @@
 = About Kuryr SDN
 
 link:https://docs.openstack.org/kuryr-kubernetes/latest/[Kuryr] is a container
-network interface (CNI) plug-in solution that uses
-link:https://docs.openstack.org/neutron/latest/[OpenStack Neutron] and
-link:https://docs.openstack.org/octavia/latest/[OpenStack Octavia] to provide
-networking for Pods and Services.
+network interface (CNI) plug-in solution that uses the
+link:https://docs.openstack.org/neutron/latest/[Neutron] and
+link:https://docs.openstack.org/octavia/latest/[Octavia] {rh-openstack-first} services
+to provide networking for Pods and Services.
 
 Kuryr and {product-title} integration is primarily designed for
-{product-title} clusters running on OpenStack VMs. Kuryr improves the
-network performance by plugging OpenShift Pods into OpenStack SDN.
-In addition, it provides interconnectivity between OpenShift Pods and
-OpenStack virtual instances.
+{product-title} clusters running on {rh-openstack} VMs. Kuryr improves the
+network performance by plugging {product-title} Pods into {rh-openstack} SDN.
+In addition, it provides interconnectivity between Pods and
+{rh-openstack} virtual instances.
 
 Kuryr components are installed as Pods in {product-title} using the
 `openshift-kuryr` namespace:
@@ -33,9 +33,9 @@ used to back {product-title} via Kuryr. This includes open source solutions
 such as Open vSwitch (OVS) and Open Virtual Network (OVN) as well as
 Neutron-compatible commercial SDNs.
 
-Kuryr is recommended for OpenShift deployments on encapsulated OpenStack tenant
+Kuryr is recommended for {product-title} deployments on encapsulated {rh-openstack} tenant
 networks to avoid double encapsulation, such as running an encapsulated
-OpenShift SDN over an OpenStack network.
+{product-title} SDN over an {rh-openstack} network.
 
 If you use provider networks or tenant VLANs, you do not need to use Kuryr to
 avoid double encapsulation. The performance benefit is negligible. Depending on

diff --git a/modules/installation-osp-config-yaml.adoc b/modules/installation-osp-config-yaml.adoc
@@ -4,7 +4,7 @@
 // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
 
 [id="installation-osp-config-yaml_{context}"]
-= Sample customized `install-config.yaml` file for OpenStack
+= Sample customized `install-config.yaml` file for {rh-openstack}
 
 This sample `install-config.yaml` demonstrates all of the possible {rh-openstack-first}
 customization options.

diff --git a/modules/installation-osp-converting-ignition-resources.adoc b/modules/installation-osp-converting-ignition-resources.adoc
@@ -8,15 +8,15 @@
 The {product-title} installation process relies on bootstrap machines that are created from a bootstrap Ignition configuration file.
 
 Edit the file and upload it. Then, create a secondary bootstrap Ignition configuration file that
-{rh-openstack} uses to download the primary file.
+{rh-openstack-first} uses to download the primary file.
 
 .Prerequisites
 
 * You have the bootstrap Ignition file that the installer program generates, `bootstrap.ign`.
 * The infrastructure ID from the installer's metadata file is set as an environment variable (`$INFRA_ID`).
 ** If the variable is not set, see *Creating the Kubernetes manifest and Ignition config files*.
 * You have an HTTP(S)-accessible way to store the bootstrap ignition file.
-** The documented procedure uses the OpenStack Image service (Glance), but you can also use the OpenStack Storage service (Swift), Amazon S3, an internal HTTP server, or an ad hoc Nova server.
+** The documented procedure uses the {rh-openstack} Image service (Glance), but you can also use the {rh-openstack} Storage service (Swift), Amazon S3, an internal HTTP server, or an ad hoc Nova server.
 
 .Procedure
 
@@ -69,7 +69,7 @@ with open('bootstrap.ign', 'w') as f:
     json.dump(ignition, f)
 ----
 
-. Using the OpenStack CLI, create an image that uses the bootstrap Ignition file:
+. Using the {rh-openstack} CLI, create an image that uses the bootstrap Ignition file:
 +
 ----
 $ openstack image create --disk-format=raw --container-format=bare --file bootstrap.ign <image_name>

diff --git a/modules/installation-osp-creating-image.adoc b/modules/installation-osp-creating-image.adoc
@@ -31,7 +31,7 @@ your {product-title} version if they are available.
 +
 [NOTE]
 ====
-You must decompress the OpenStack image before the cluster can use it. The name of the downloaded file might not contain a compression extension, like `.gz` or `.tgz`. To find out if or how the file is compressed, in a command line, enter:
+You must decompress the {rh-openstack} image before the cluster can use it. The name of the downloaded file might not contain a compression extension, like `.gz` or `.tgz`. To find out if or how the file is compressed, in a command line, enter:
 
 ----
 $ file <name_of_downloaded_file>

diff --git a/modules/installation-osp-creating-network-resources.adoc b/modules/installation-osp-creating-network-resources.adoc
@@ -679,7 +679,7 @@ $ ansible-playbook -i inventory.yaml 01_security-groups.yaml
 $ ansible-playbook -i inventory.yaml 02_network.yaml
 ----
 
-. _Optional_: If you want to control the default resolvers that Nova servers use, run the OpenStack CLI command:
+. _Optional_: If you want to control the default resolvers that Nova servers use, run the {rh-openstack} CLI command:
 +
 ----
 $ openstack subnet set --dns-nameserver <server_1> --dns-nameserver <server_2> "$INFRA_ID-nodes"
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ your {product-title} version if they are available. @@
     +
     [NOTE]
     ====
-    You must decompress the OpenStack image before the cluster can use it. The name of the downloaded file might not contain a compression extension, like `.gz` or `.tgz`. To find out if or how the file is compressed, in a command line, enter:
+    You must decompress the {rh-openstack} image before the cluster can use it. The name of the downloaded file might not contain a compression extension, like `.gz` or `.tgz`. To find out if or how the file is compressed, in a command line, enter:
     ----
     $ file <name_of_downloaded_file>
@@ Expand Down @@