Skip to content

Commit 73cbf10

Browse files
committed
added plus sign
1 parent a10bf45 commit 73cbf10

13 files changed

+170
-150
lines changed

docs_user/modules/proc_configuring-networking-for-control-plane-services.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ spec:
5353
"ipam": {
5454
"type": "whereabouts",
5555
"range": "172.17.0.0/24",
56-
"range_start": "172.17.0.20", <1>
57-
"range_end": "172.17.0.50", <2>
58-
"exclude": [ <3>
56+
"range_start": "172.17.0.20",
57+
"range_end": "172.17.0.50",
58+
"exclude": [
5959
"172.17.0.24/32",
6060
"172.17.0.44/31"
6161
]
6262
}
6363
}
6464
----
6565
+
66-
<1> Defines the start of the IP range.
67-
<2> Defines the end of the IP range.
68-
<3> Excludes part of the IP range. This example excludes IP addresses `172.17.0.24/32` and `172.17.0.44/31` from the allocation pool.
66+
* `spec.config.ipam.range_start` defines the start of the IP range.
67+
* `spec.config.ipam.range_end` defines the end of the IP range.
68+
* `spec.config.ipam.exclude` excludes part of the IP range. This example excludes IP addresses `172.17.0.24/32` and `172.17.0.44/31` from the allocation pool.
6969

7070
. If your {OpenStackShort} services require load balancer IP addresses, define the pools for these services in an `IPAddressPool` CR. For example:
7171
+

docs_user/modules/proc_deploying-backend-services.adoc

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ metadata:
142142
name: openstack
143143
spec:
144144
secret: osp-secret
145-
storageClass: <storage_class> <1>
145+
storageClass: <storage_class>
146146
147147
barbican:
148148
enabled: false
@@ -167,7 +167,7 @@ spec:
167167
annotations:
168168
metallb.universe.tf/address-pool: ctlplane
169169
metallb.universe.tf/allow-shared-ip: ctlplane
170-
metallb.universe.tf/loadBalancerIPs: 192.168.122.80 <2>
170+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
171171
172172
spec:
173173
type: LoadBalancer
@@ -213,7 +213,7 @@ spec:
213213
secret: osp-secret
214214
replicas: 3
215215
storageRequest: 5G
216-
openstack-cell1: <3>
216+
openstack-cell1:
217217
secret: osp-secret
218218
replicas: 3
219219
storageRequest: 5G
@@ -270,7 +270,7 @@ spec:
270270
metadata:
271271
annotations:
272272
metallb.universe.tf/address-pool: internalapi
273-
metallb.universe.tf/loadBalancerIPs: 172.17.0.85
273+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
274274
spec:
275275
type: LoadBalancer
276276
rabbitmq-cell1:
@@ -281,7 +281,7 @@ spec:
281281
metadata:
282282
annotations:
283283
metallb.universe.tf/address-pool: internalapi
284-
metallb.universe.tf/loadBalancerIPs: 172.17.0.86
284+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
285285
286286
spec:
287287
type: LoadBalancer
@@ -293,7 +293,7 @@ spec:
293293
metadata:
294294
annotations:
295295
metallb.universe.tf/address-pool: internalapi
296-
metallb.universe.tf/loadBalancerIPs: 172.17.0.87
296+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
297297
spec:
298298
type: LoadBalancer
299299
rabbitmq-cell3:
@@ -304,12 +304,12 @@ spec:
304304
metadata:
305305
annotations:
306306
metallb.universe.tf/address-pool: internalapi
307-
metallb.universe.tf/loadBalancerIPs: 172.17.0.88
307+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
308308
spec:
309309
type: LoadBalancer
310310
telemetry:
311311
enabled: false
312-
tls: <4>
312+
tls:
313313
podLevel:
314314
enabled: false
315315
ingress:
@@ -326,10 +326,28 @@ spec:
326326
EOF
327327
----
328328
+
329-
<1> Select an existing `<storage_class>` in your {OpenShiftShort} cluster.
330-
<2> Replace `<loadBalancer_IP>` with the LoadBalancer IP address.
331-
<3> This example provides the required infrastructure database and messaging services for 3 Compute cells named `cell1`, `cell2`, and `cell3`. Adjust the values for fields such as `replicas`, `storage`, or `storageRequest`, for each Compute cell as needed.
332-
<4> If you enabled TLS-e in your {OpenStackShort} environment, in the `spec:tls` section set `tls` to the following:
329+
where:
330+
331+
<storage_class>::
332+
Specifies an existing storage class in your {OpenShiftShort} cluster.
333+
334+
<loadBalancer_IP>::
335+
Specifies the LoadBalancer IP address. If you use IPv6, change the load balancer IPs to the IPs in your environment, for example:
336+
+
337+
----
338+
...
339+
metallb.universe.tf/allow-shared-ip: ctlplane
340+
metallb.universe.tf/loadBalancerIPs: fd00:aaaa::80
341+
...
342+
metallb.universe.tf/address-pool: internalapi
343+
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::85
344+
...
345+
metallb.universe.tf/address-pool: internalapi
346+
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::86
347+
----
348+
349+
* `galera.openstack-cell1` provides the required infrastructure database and messaging services for the Compute cells, for example, `cell1`, `cell2`, and `cell3`. Adjust the values for fields such as `replicas`, `storage`, or `storageRequest`, for each Compute cell as needed.
350+
* `spec.tls` specifies whether TLS-e is enabled. If you enabled TLS-e in your {OpenStackShort} environment, set `tls` to the following:
333351
+
334352
----
335353
spec:
@@ -351,22 +369,6 @@ spec:
351369
customIssuer: rootca-internal
352370
enabled: true
353371
----
354-
+
355-
[NOTE]
356-
====
357-
If you use IPv6, change the load balancer IPs to the IPs in your environment, for example:
358-
----
359-
...
360-
metallb.universe.tf/allow-shared-ip: ctlplane
361-
metallb.universe.tf/loadBalancerIPs: fd00:aaaa::80
362-
...
363-
metallb.universe.tf/address-pool: internalapi
364-
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::85
365-
...
366-
metallb.universe.tf/address-pool: internalapi
367-
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::86
368-
----
369-
====
370372
endif::[]
371373

372374
ifeval::["{build_variant}" == "ospdo"]
@@ -382,7 +384,7 @@ metadata:
382384
name: openstack
383385
spec:
384386
secret: osp-secret
385-
storageClass: <storage_class> <1>
387+
storageClass: <storage_class>
386388
387389
388390
barbican:
@@ -406,9 +408,9 @@ spec:
406408
service:
407409
metadata:
408410
annotations:
409-
metallb.universe.tf/address-pool: <address_pool> <2>
411+
metallb.universe.tf/address-pool: <address_pool>
410412
metallb.universe.tf/allow-shared-ip: <address_pool>
411-
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP> <3>
413+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP>
412414
spec:
413415
type: LoadBalancer
414416
options:
@@ -453,7 +455,7 @@ spec:
453455
secret: osp-secret
454456
replicas: 3
455457
storageRequest: 5G
456-
openstack-cell1: <4>
458+
openstack-cell1:
457459
secret: osp-secret
458460
replicas: 3
459461
storageRequest: 5G
@@ -492,7 +494,7 @@ spec:
492494
ovndbcluster-nb:
493495
replicas: 3
494496
dbType: NB
495-
networkAttachment: <networkAttachment_name> <5>
497+
networkAttachment: <networkAttachment_name>
496498
ovndbcluster-sb:
497499
replicas: 3
498500
dbType: SB
@@ -549,7 +551,7 @@ spec:
549551
telemetry:
550552
enabled: false
551553
552-
tls: <6>
554+
tls:
553555
podLevel:
554556
enabled: false
555557
ingress:
@@ -567,12 +569,34 @@ spec:
567569
EOF
568570
----
569571
+
570-
<1> Select an existing `<storage_class>` in your {OpenShiftShort} cluster.
571-
<2> Replace `<address_pool>` with the name of your network definition.
572-
<3> Replace `<loadBalancer_IP>` with the LoadBalancer IP address.
573-
<4> This example provides the required infrastructure database and messaging services for 3 Compute cells named `cell1`, `cell2`, and `cell3`. Adjust the values for fields such as `replicas`, `storage`, or `storageRequest`, for each Compute cell as needed.
574-
<5> Replace `<networkAttachment_name>` with the name of your network.
575-
<6> If you enabled TLS-e in your {OpenStackShort} environment, in the `spec:tls` section set `tls` to the following:
572+
where:
573+
574+
<storage_class>::
575+
Specifies an existing storage class in your {OpenShiftShort} cluster.
576+
577+
<address_pool>::
578+
Specifies name of your network definition.
579+
580+
<loadBalancer_IP>::
581+
Specifies the LoadBalancer IP address. If you use IPv6, change the load balancer IPs to the IPs in your environment, for example:
582+
+
583+
----
584+
...
585+
metallb.universe.tf/allow-shared-ip: ctlplane
586+
metallb.universe.tf/loadBalancerIPs: fd00:aaaa::80
587+
...
588+
metallb.universe.tf/address-pool: internalapi
589+
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::85
590+
...
591+
metallb.universe.tf/address-pool: internalapi
592+
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::86
593+
----
594+
595+
<networkAttachment_name>::
596+
Specifies the name of your network.
597+
598+
* `galera.openstack-cell1` provides the required infrastructure database and messaging services for the Compute cells, for example, `cell1`, `cell2`, and `cell3`. Adjust the values for fields such as `replicas`, `storage`, or `storageRequest`, for each Compute cell as needed.
599+
* `spec.tls` specifies whether TLS-e is enabled. If you enabled TLS-e in your {OpenStackShort} environment, set `tls` to the following:
576600
+
577601
----
578602
spec:
@@ -594,22 +618,6 @@ spec:
594618
customIssuer: rootca-internal
595619
enabled: true
596620
----
597-
598-
[NOTE]
599-
====
600-
If you use IPv6, change the load balancer IPs to the IPs in your environment, for example:
601-
----
602-
...
603-
metallb.universe.tf/allow-shared-ip: ctlplane
604-
metallb.universe.tf/loadBalancerIPs: fd00:aaaa::80
605-
...
606-
metallb.universe.tf/address-pool: internalapi
607-
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::85
608-
...
609-
metallb.universe.tf/address-pool: internalapi
610-
metallb.universe.tf/loadBalancerIPs: fd00:bbbb::86
611-
----
612-
====
613621
endif::[]
614622

615623

docs_user/modules/proc_deploying-file-systems-service-control-plane.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ spec:
7171
annotations:
7272
metallb.universe.tf/address-pool: internalapi
7373
metallb.universe.tf/allow-shared-ip: internalapi
74-
metallb.universe.tf/loadBalancerIPs: 172.17.0.80 <1>
74+
metallb.universe.tf/loadBalancerIPs: <172.17.0.80>
7575
spec:
7676
type: LoadBalancer
7777
manilaScheduler:
@@ -85,16 +85,16 @@ spec:
8585
host = hostgroup
8686
[cephfs]
8787
driver_handles_share_servers=False
88-
share_backend_name=cephfs <2>
88+
share_backend_name=cephfs
8989
share_driver=manila.share.drivers.cephfs.driver.CephFSDriver
9090
cephfs_conf_path=/etc/ceph/ceph.conf
9191
cephfs_auth_id=openstack
9292
cephfs_cluster_name=ceph
9393
cephfs_volume_mode=0755
9494
cephfs_protocol_helper_type=CEPHFS
95-
networkAttachments: <3>
95+
networkAttachments:
9696
- storage
97-
extraMounts: <4>
97+
extraMounts:
9898
- name: v1
9999
region: r1
100100
extraVol:
@@ -112,10 +112,10 @@ spec:
112112
__EOF__
113113
----
114114
+
115-
<1> If you use IPv6, change the load balancer IP to the load balancer IP in your environment, for example, `metallb.universe.tf/loadBalancerIPs: fd00:bbbb::80`.
116-
<2> Ensure that the names of the back ends (`share_backend_name`) are the same as they were in {OpenStackShort} {rhos_prev_ver}.
117-
<3> Ensure that you specify the appropriate storage management network in the `networkAttachments` section. For example, the `manilaShares` instance with the CephFS back-end driver is connected to the `storage` network.
118-
<4> If you need to add extra files to any of the services, you can use `extraMounts`. For example, when using {Ceph}, you can add the {rhos_component_storage_file} Ceph user's keyring file as well as the `ceph.conf` configuration file.
115+
* `metallb.universe.tf/loadBalancerIPs:<172.17.0.80>` specifies the load balancer IP in your environment. If you use IPv6, change the load balancer IP to the load balancer IP in your environment, for example, `metallb.universe.tf/loadBalancerIPs: fd00:bbbb::80`.
116+
* `share_backend_name` specifies the names of the back ends to use in {rhos_long}. Ensure that the names of the back ends are the same as they were in {OpenStackShort} {rhos_prev_ver}.
117+
* `networkAttachments` specifies the appropriate storage management network. For example, the `manilaShares` instance with the CephFS back-end driver is connected to the `storage` network.
118+
* `extraMounts` specifies additional files to add to any of the services. For example, when using {Ceph}, you can add the {rhos_component_storage_file} Ceph user's keyring file as well as the `ceph.conf` configuration file.
119119
+
120120
The following example patch file uses CephFS through NFS:
121121
+
@@ -141,7 +141,7 @@ spec:
141141
annotations:
142142
metallb.universe.tf/address-pool: internalapi
143143
metallb.universe.tf/allow-shared-ip: internalapi
144-
metallb.universe.tf/loadBalancerIPs: 172.17.0.80
144+
metallb.universe.tf/loadBalancerIPs: <172.17.0.80>
145145
spec:
146146
type: LoadBalancer
147147
manilaScheduler:

docs_user/modules/proc_deploying-the-bare-metal-provisioning-service.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
annotations:
6161
metallb.universe.tf/address-pool: internalapi
6262
metallb.universe.tf/allow-shared-ip: internalapi
63-
metallb.universe.tf/loadBalancerIPs: 172.17.0.80 <1>
63+
metallb.universe.tf/loadBalancerIPs: <loadBalancer_IP> <1>
6464
spec:
6565
type: LoadBalancer
6666
ironicConductors:
@@ -100,7 +100,10 @@ spec:
100100
'
101101
----
102102
+
103-
<1> If you use IPv6, change the load balancer IP to the load balancer IP in your environment, for example, `metallb.universe.tf/loadBalancerIPs: fd00:bbbb::80`.
103+
where:
104+
105+
<loadBalancer_IP>::
106+
Specifies the load balancer IP in your environment. If you use IPv6, change the load balancer IP to the load balancer IP in your environment, for example, `metallb.universe.tf/loadBalancerIPs: fd00:bbbb::80`.
104107

105108
. Wait for the {bare_metal} control plane services CRs to become ready:
106109
+

0 commit comments

Comments
 (0)