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/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
@@ -77,7 +77,7 @@ ifdef::gcp[]
 Google Cloud Platform (GCP).
 endif::gcp[]
 ifdef::osp[]
-OpenStack.
+{rh-openstack-first}.
 endif::osp[]
 
 .Prerequisites

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.
 
 Conversely, Kuryr is not recommended in the following cases:
 

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-default-deployment.adoc b/modules/installation-osp-default-deployment.adoc
@@ -8,7 +8,7 @@ ifeval::["{context}" == "installing-openstack-installer-custom"]
 endif::[]
 
 [id="installation-osp-default-deployment_{context}"]
-= Resource guidelines for installing {product-title} on OpenStack
+= Resource guidelines for installing {product-title} on {rh-openstack}
 
 Your quota must meet the following requirements to run the {product-title} installation program in {rh-openstack-first}.
 

diff --git a/modules/installation-osp-default-kuryr-deployment.adoc b/modules/installation-osp-default-kuryr-deployment.adoc
@@ -3,7 +3,7 @@
 // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
 
 [id="installation-osp-default-kuryr-deployment_{context}"]
-= Resource guidelines for installing {product-title} on OpenStack with Kuryr
+= Resource guidelines for installing {product-title} on {rh-openstack} with Kuryr
 
 When using Kuryr SDN, the Pods, Services, namespaces, and network policies are
 using resources from the {rh-openstack} quota; this increases the minimum
@@ -67,7 +67,7 @@ machines, and a bootstrap machine.
 
 To enable Kuryr SDN, your environment must meet the following requirements:
 
-* Run OpenStack 13+.
+* Run {rh-openstack} 13+.
 * Have Overcloud with Octavia.
 * Use Neutron Trunk ports extension.
 * Use `openvswitch` firewall driver if ML2/OVS Neutron driver is used instead

diff --git a/modules/installation-osp-describing-cloud-parameters.adoc b/modules/installation-osp-describing-cloud-parameters.adoc
@@ -13,14 +13,14 @@ The {product-title} installation program relies on a file called `clouds.yaml`.
 
 . Create the `clouds.yaml` file:
 
-** If your OpenStack distribution includes the Horizon web UI, generate a `clouds.yaml` file in it.
+** If your {rh-openstack} distribution includes the Horizon web UI, generate a `clouds.yaml` file in it.
 +
 [IMPORTANT]
 ====
 Remember to add a password to the `auth` field. You can also keep secrets in link:https://docs.openstack.org/os-client-config/latest/user/configuration.html#splitting-secrets[a separate file] from `clouds.yaml`.
 ====
 
-** If your OpenStack distribution does not include the Horizon web UI, or you do not want to use Horizon, create the file yourself. For detailed information about `clouds.yaml`, see https://docs.openstack.org/openstacksdk/latest/user/config/configuration.html#config-files[Config files] in the {rh-openstack} documentation.
+** If your {rh-openstack} distribution does not include the Horizon web UI, or you do not want to use Horizon, create the file yourself. For detailed information about `clouds.yaml`, see https://docs.openstack.org/openstacksdk/latest/user/config/configuration.html#config-files[Config files] in the {rh-openstack} documentation.
 +
 ----
 clouds:

diff --git a/modules/installation-osp-enabling-swift.adoc b/modules/installation-osp-enabling-swift.adoc
@@ -7,7 +7,7 @@
 [id="installation-osp-enabling-swift_{context}"]
 = Enabling Swift on OpenStack
 
-{product-title} on {rh-openstack-first} uses https://docs.openstack.org/security-guide/object-storage.html[OpenStack Object Storage (Swift)] to store and serve user configuration files.
+{product-title} on {rh-openstack-first} uses https://docs.openstack.org/security-guide/object-storage.html[{rh-openstack} Object Storage (Swift)] to store and serve user configuration files.
 
 Swift is operated by a user account with the `swiftoperator` role.
 

diff --git a/modules/installation-osp-kuryr-config-yaml.adoc b/modules/installation-osp-kuryr-config-yaml.adoc
@@ -3,7 +3,7 @@
 // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
 
 [id="installation-osp-kuryr-config-yaml_{context}"]
-= Sample customized `install-config.yaml` file for OpenStack with Kuryr
+= Sample customized `install-config.yaml` file for {rh-openstack} with Kuryr
 
 To deploy with Kuryr SDN instead of the default OpenShift SDN, you must
 modify the `install-config.yaml` file to include `Kuryr` as the desired
@@ -61,6 +61,6 @@ sshKey: ssh-ed25519 AAAA...
 Both `trunkSupport` and `octaviaSupport` are automatically discovered by the
 installer, so there is no need to set them. But if your environment does not
 meet both requirements, Kuryr SDN will not properly work. Trunks are needed
-to connect the Pods to the OpenStack network and Octavia is required to create the
+to connect the Pods to the {rh-openstack} network and Octavia is required to create the
 OpenShift Services.
 ====
diff --git a/modules/installation-osp-kuryr-increase-quota.adoc b/modules/installation-osp-kuryr-increase-quota.adoc
@@ -5,7 +5,7 @@
 [id="installation-osp-kuryr-increase-quota_{context}"]
 = Increasing quota
 
-When using Kuryr SDN, you must increase quotas to satisfy the OpenStack
+When using Kuryr SDN, you must increase quotas to satisfy the {rh-openstack-first}
 resources used by Pods, Services, namespaces, and network policies.
 
 .Procedure

diff --git a/modules/installation-osp-kuryr-neutron-configuration.adoc b/modules/installation-osp-kuryr-neutron-configuration.adoc
@@ -6,7 +6,7 @@
 = Configuring Neutron
 
 Kuryr CNI leverages the Neutron Trunks extension to plug containers into the
-OpenStack SDN, so you must use the `trunks` extension for Kuryr to properly work.
+{rh-openstack-first} SDN, so you must use the `trunks` extension for Kuryr to properly work.
 
 In addition, if you leverage the default ML2/OVS Neutron driver, the firewall
 must be set to `openvswitch` instead of `ovs_hybrid` so that security groups are