Skip to content

Commit 6f90944

Browse files
committed
OpenStack -> common attributes on Welcome page
- Find and semi-manually sub in OSP attributes across most mods - RHOSP attribute sub in APIs module
1 parent 70af573 commit 6f90944

32 files changed

+91
-92
lines changed

modules/apis.adoc

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6609,7 +6609,7 @@ The following table describes the parameters for CinderPersistentVolumeSource ob
66096609
| 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
66106610
| `secretRef`
66116611
| SecretReference
6612-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
6612+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack-first}.
66136613
| `volumeID`
66146614
| string
66156615
| 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:
95649564
| 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
95659565
| `secretRef`
95669566
| LocalObjectReference
9567-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
9567+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
95689568
| `volumeID`
95699569
| string
95709570
| 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:
1282712827
| 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
1282812828
| `secretRef`
1282912829
| LocalObjectReference
12830-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
12830+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
1283112831
| `volumeID`
1283212832
| string
1283312833
| 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:
1552415524
| 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
1552515525
| `secretRef`
1552615526
| LocalObjectReference
15527-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
15527+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
1552815528
| `volumeID`
1552915529
| string
1553015530
| 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:
1932519325
| Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
1932619326
| `ip`
1932719327
| string
19328-
| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
19328+
| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
1932919329
|===
1933019330
==== SessionAffinityConfig [v1/core]
1933119331

@@ -26811,7 +26811,7 @@ The following table describes the parameters for CinderVolumeSource object:
2681126811
| 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
2681226812
| `secretRef`
2681326813
| LocalObjectReference
26814-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
26814+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
2681526815
| `volumeID`
2681626816
| string
2681726817
| 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:
2968029680
| 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
2968129681
| `secretRef`
2968229682
| LocalObjectReference
29683-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
29683+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
2968429684
| `volumeID`
2968529685
| string
2968629686
| 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:
3263132631
| 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
3263232632
| `secretRef`
3263332633
| LocalObjectReference
32634-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
32634+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
3263532635
| `volumeID`
3263632636
| string
3263732637
| 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:
3592035920
| 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
3592135921
| `secretRef`
3592235922
| LocalObjectReference
35923-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
35923+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
3592435924
| `volumeID`
3592535925
| string
3592635926
| 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:
3884638846
| 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
3884738847
| `secretRef`
3884838848
| LocalObjectReference
38849-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
38849+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
3885038850
| `volumeID`
3885138851
| string
3885238852
| 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:
4554245542
| 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
4554345543
| `secretRef`
4554445544
| LocalObjectReference
45545-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
45545+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
4554645546
| `volumeID`
4554745547
| string
4554845548
| 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:
4837748377
| 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
4837848378
| `secretRef`
4837948379
| LocalObjectReference
48380-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
48380+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
4838148381
| `volumeID`
4838248382
| string
4838348383
| 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:
6000260002
| 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
6000360003
| `secretRef`
6000460004
| LocalObjectReference
60005-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
60005+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
6000660006
| `volumeID`
6000760007
| string
6000860008
| 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:
6289762897
| 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
6289862898
| `secretRef`
6289962899
| LocalObjectReference
62900-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
62900+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
6290162901
| `volumeID`
6290262902
| string
6290362903
| 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:
6500465004
| Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
6500565005
| `ip`
6500665006
| string
65007-
| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
65007+
| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
6500865008
|===
6500965009
==== IngressTLS [v1beta1/extensions]
6501065010

@@ -68700,7 +68700,7 @@ The following table describes the parameters for CinderVolumeSource object:
6870068700
| 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
6870168701
| `secretRef`
6870268702
| LocalObjectReference
68703-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
68703+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
6870468704
| `volumeID`
6870568705
| string
6870668706
| 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:
7569975699
| Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)
7570075700
| `ip`
7570175701
| string
75702-
| IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)
75702+
| IP is set for load-balancer ingress points that are IP based (typically GCE or {rh-openstack} load-balancers)
7570375703
|===
7570475704
==== IngressTLS [v1beta1/networking]
7570575705

@@ -90729,7 +90729,7 @@ The following table describes the parameters for CinderVolumeSource object:
9072990729
| 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
9073090730
| `secretRef`
9073190731
| LocalObjectReference
90732-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
90732+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
9073390733
| `volumeID`
9073490734
| string
9073590735
| 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:
9281992819
| 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
9282092820
| `secretRef`
9282192821
| LocalObjectReference
92822-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
92822+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
9282392823
| `volumeID`
9282492824
| string
9282592825
| 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:
9491594915
| 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
9491694916
| `secretRef`
9491794917
| LocalObjectReference
94918-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
94918+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
9491994919
| `volumeID`
9492094920
| string
9492194921
| 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
9925899258
| 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
9925999259
| `secretRef`
9926099260
| SecretReference
99261-
| Optional: points to a secret object containing parameters used to connect to OpenStack.
99261+
| Optional: points to a secret object containing parameters used to connect to {rh-openstack}.
9926299262
| `volumeID`
9926399263
| string
9926499264
| volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md

modules/cluster-storage-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ No configuration is required.
2424
[discrete]
2525
== Notes
2626

27-
* The Cluster Storage Operator supports Amazon Web Services (AWS) and Red Hat OpenStack.
27+
* The Cluster Storage Operator supports Amazon Web Services (AWS) and {rh-openstack-first}.
2828
* The created storage class can be made non-default by editing its annotation, but
29-
the storage class cannot be deleted as long as the Operator runs.
29+
the storage class cannot be deleted as long as the Operator runs.

modules/cnf-understanding-low-latency.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Many of the deployed applications in the Telco space require low latency that
2020
can only tolerate zero packet loss. Tuning for zero packet loss helps mitigate
2121
the inherent issues that degrade network performance. For more information, see
2222
link:https://www.redhat.com/en/blog/tuning-zero-packet-loss-red-hat-openstack-platform-part-1[Tuning
23-
for Zero Packet Loss in Red Hat OpenStack Platform].
23+
for Zero Packet Loss in {rh-openstack-first}].
2424

2525
The Edge computing initiative also comes in to play for reducing latency rates.
2626
Think of it as literally being on the edge of the cloud and closer to the user.

modules/dynamic-provisioning-available-plugins.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ configured provider's API to create new storage resources:
1717
|Provisioner plug-in name
1818
|Notes
1919

20-
|OpenStack Cinder
20+
|{rh-openstack-first} Cinder
2121
|`kubernetes.io/cinder`
2222
|
2323

modules/dynamic-provisioning-cinder-definition.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * storage/dynamic-provisioning.adoc
44

55
[id="openstack-cinder-storage-class_{context}"]
6-
= OpenStack Cinder object definition
6+
= {rh-openstack} Cinder object definition
77

88
.cinder-storageclass.yaml
99
[source,yaml]

modules/installation-initializing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ifdef::gcp[]
9494
Google Cloud Platform (GCP).
9595
endif::gcp[]
9696
ifdef::osp[]
97-
OpenStack.
97+
{rh-openstack-first}.
9898
endif::osp[]
9999
ifdef::rhv[]
100100
{rh-virtualization-first}.

modules/installation-osp-about-kuryr.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
= About Kuryr SDN
77

88
link:https://docs.openstack.org/kuryr-kubernetes/latest/[Kuryr] is a container
9-
network interface (CNI) plug-in solution that uses
10-
link:https://docs.openstack.org/neutron/latest/[OpenStack Neutron] and
11-
link:https://docs.openstack.org/octavia/latest/[OpenStack Octavia] to provide
12-
networking for Pods and Services.
9+
network interface (CNI) plug-in solution that uses the
10+
link:https://docs.openstack.org/neutron/latest/[Neutron] and
11+
link:https://docs.openstack.org/octavia/latest/[Octavia] {rh-openstack-first} services
12+
to provide networking for Pods and Services.
1313

1414
Kuryr and {product-title} integration is primarily designed for
15-
{product-title} clusters running on OpenStack VMs. Kuryr improves the
16-
network performance by plugging OpenShift Pods into OpenStack SDN.
17-
In addition, it provides interconnectivity between OpenShift Pods and
18-
OpenStack virtual instances.
15+
{product-title} clusters running on {rh-openstack} VMs. Kuryr improves the
16+
network performance by plugging {product-title} Pods into {rh-openstack} SDN.
17+
In addition, it provides interconnectivity between Pods and
18+
{rh-openstack} virtual instances.
1919

2020
Kuryr components are installed as Pods in {product-title} using the
2121
`openshift-kuryr` namespace:
@@ -33,9 +33,9 @@ used to back {product-title} via Kuryr. This includes open source solutions
3333
such as Open vSwitch (OVS) and Open Virtual Network (OVN) as well as
3434
Neutron-compatible commercial SDNs.
3535

36-
Kuryr is recommended for OpenShift deployments on encapsulated OpenStack tenant
36+
Kuryr is recommended for {product-title} deployments on encapsulated {rh-openstack} tenant
3737
networks to avoid double encapsulation, such as running an encapsulated
38-
OpenShift SDN over an OpenStack network.
38+
{product-title} SDN over an {rh-openstack} network.
3939

4040
If you use provider networks or tenant VLANs, you do not need to use Kuryr to
4141
avoid double encapsulation. The performance benefit is negligible. Depending on

modules/installation-osp-config-yaml.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
55

66
[id="installation-osp-config-yaml_{context}"]
7-
= Sample customized `install-config.yaml` file for OpenStack
7+
= Sample customized `install-config.yaml` file for {rh-openstack}
88

99
This sample `install-config.yaml` demonstrates all of the possible {rh-openstack-first}
1010
customization options.

modules/installation-osp-converting-ignition-resources.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
The {product-title} installation process relies on bootstrap machines that are created from a bootstrap Ignition configuration file.
99

1010
Edit the file and upload it. Then, create a secondary bootstrap Ignition configuration file that
11-
{rh-openstack} uses to download the primary file.
11+
{rh-openstack-first} uses to download the primary file.
1212

1313
.Prerequisites
1414

1515
* You have the bootstrap Ignition file that the installer program generates, `bootstrap.ign`.
1616
* The infrastructure ID from the installer's metadata file is set as an environment variable (`$INFRA_ID`).
1717
** If the variable is not set, see *Creating the Kubernetes manifest and Ignition config files*.
1818
* You have an HTTP(S)-accessible way to store the bootstrap ignition file.
19-
** 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.
19+
** 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.
2020

2121
.Procedure
2222

@@ -69,7 +69,7 @@ with open('bootstrap.ign', 'w') as f:
6969
json.dump(ignition, f)
7070
----
7171

72-
. Using the OpenStack CLI, create an image that uses the bootstrap Ignition file:
72+
. Using the {rh-openstack} CLI, create an image that uses the bootstrap Ignition file:
7373
+
7474
----
7575
$ openstack image create --disk-format=raw --container-format=bare --file bootstrap.ign <image_name>

modules/installation-osp-creating-image.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ your {product-title} version if they are available.
3131
+
3232
[NOTE]
3333
====
34-
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:
34+
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:
3535
3636
----
3737
$ file <name_of_downloaded_file>

0 commit comments

Comments
 (0)