Skip to content

Commit 9327db3

Browse files
committed
linting error
1 parent 2df6d47 commit 9327db3

4 files changed

+76
-71
lines changed

docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -88,28 +88,28 @@ $ CEPH_FSID=$(oc get secret ceph-conf-files -o json | jq -r '.data."ceph.conf"'
8888
8989
$ alias openstack="oc exec -t openstackclient -- openstack"
9090
91-
$ DEFAULT_CELL_NAME="cell3" <1>
91+
$ *DEFAULT_CELL_NAME="cell3"*
9292
$ RENAMED_CELLS="cell1 cell2 $DEFAULT_CELL_NAME"
9393
9494
$ declare -A COMPUTES_CELL1
95-
$ export COMPUTES_CELL1=( <2>
96-
> ["standalone.localdomain"]="192.168.122.100" <3>
97-
> # <compute1> <4>
98-
> # <compute2>
99-
> # <compute3>
95+
$ *export COMPUTES_CELL1=(*
96+
> *["standalone.localdomain"]="192.168.122.100"*
97+
> # *<compute1>*
98+
> # *<compute2>*
99+
> # *<compute3>*
100100
>)
101101
$ declare -A COMPUTES_CELL2
102102
$ export COMPUTES_CELL2=(
103103
> # ...
104104
>)
105105
$ declare -A COMPUTES_CELL3
106-
$ export COMPUTES_CELL3=(
107-
> # ... <5>
106+
$*export COMPUTES_CELL3=(*
107+
> # <compute1>
108108
>)
109-
># ...
109+
># <compute2>
110110
111111
$ declare -A COMPUTES_API_CELL1
112-
$ export COMPUTES_API_CELL1=( <6>
112+
$*export COMPUTES_API_CELL1=(*
113113
> ["standalone.localdomain"]="172.17.0.100"
114114
> # ...
115115
>)
@@ -120,19 +120,19 @@ $ for CELL in $(echo $RENAMED_CELLS); do
120120
> ref="COMPUTES_$(echo ${CELL}|tr '[:lower:]' '[:upper:]')"
121121
> eval names=\${!${ref}[@]}
122122
> [ -z "$names" ] && continue
123-
> NODESETS="'openstack-${CELL}', $NODESETS" <7>
123+
>*NODESETS="'openstack-${CELL}', $NODESETS"*
124124
>done
125125
$ NODESETS="[${NODESETS%,*}]"
126126
----
127127
+
128-
<1> The source cloud `default` cell acquires a new `DEFAULT_CELL_NAME` on the destination cloud after adoption.
128+
* `DEFAULT_CELL_NAME="cell3"` defines the source cloud `default` cell that acquires a new `DEFAULT_CELL_NAME` on the destination cloud after adoption.
129129
In a multi-cell adoption scenario, you can retain the original name, `default`, or create a new cell default name by providing the incremented index of the last cell in the source cloud. For example, if the incremented index of the last cell is `cell5`, the new cell default name is `cell6`.
130-
<2> For each cell, update the `<["standalone.localdomain"]="x.x.x.x">` value and the `COMPUTES_CELL<X>` value with the names and IP addresses of the {compute_service} nodes that are connected to the `ctlplane` and `internalapi` networks. Do not specify a real FQDN defined for each network. Always use the same hostname for each connected network of a Compute node. Provide the IP addresses and the names of the hosts on the remaining networks of the source cloud as needed. Or you can manually adjust the files that you generate in step 9 of this procedure.
131-
<3> If your deployment has a custom DNS domain, specify it in the FQDN value of the nodes. This value is used in the data plane node set `spec.nodes.<NODE NAME>.hostName`.
132-
<4> Assign all {compute_service} nodes from the source cloud `cell1` cell into `COMPUTES_CELL1`, and so on. Replace `<compute1>`, `<compute2>`, and `<compute3>` with the names of your {compute_service} nodes.
133-
<5> Assign all {compute_service} nodes from the source cloud `default` cell into `COMPUTES_CELL<X>` and `COMPUTES_API_CELL<X>``, where `<X>` is the `DEFAULT_CELL_NAME` environment variable value. In this example, the `DEFAULT_CELL_NAME` environment variable value equals `cell3`.
134-
<6> For each cell, update the `<["standalone.localdomain"]="192.168.122.100">` value and the `COMPUTES_API_CELL` value with the names and IP addresses of the {compute_service} nodes that are connected to the `ctlplane` and `internalapi` networks. Do not specify a real FQDN defined for each network. Use the same host name for each of its connected networks. Provide the IP addresses and the names of the hosts on the remaining networks of the source cloud as needed. Or you can manually adjust the files that you generate in step 9 of this procedure.
135-
<7> Cells that do not contain Compute nodes are omitted from this template because no node sets are created for the cells.
130+
* `export COMPUTES_CELL1=` defines the `<["standalone.localdomain"]="x.x.x.x">` value and the `COMPUTES_CELL<X>` value for each cell with the names and IP addresses of the {compute_service} nodes that are connected to the `ctlplane` and `internalapi` networks. Do not specify a real FQDN defined for each network. Always use the same hostname for each connected network of a Compute node. Provide the IP addresses and the names of the hosts on the remaining networks of the source cloud as needed. Or you can manually adjust the files that you generate in step 9 of this procedure.
131+
* `["standalone.localdomain"]="192.168.122.100"` defines the custom DNS domain in the FQDN value of the nodes. This value is used in the data plane node set `spec.nodes.<NODE NAME>.hostName`.
132+
* `<compute1>`, `<compute2>`, and `<compute3>` specifies the names of your {compute_service} nodes. Assign all {compute_service} nodes from the source cloud `cell1` cell into `COMPUTES_CELL1`, and so on.
133+
* `export COMPUTES_CELL3=(` specifies all {compute_service} nodes that you assign from the source cloud `default` cell into `COMPUTES_CELL<X>` and `COMPUTES_API_CELL<X>``, where `<X>` is the `DEFAULT_CELL_NAME` environment variable value. In this example, the `DEFAULT_CELL_NAME` environment variable value equals `cell3`.
134+
* `export COMPUTES_API_CELL1=(` defines the `<["standalone.localdomain"]="192.168.122.100">` value and the `COMPUTES_API_CELL` value for each cell. Update these values with the names and IP addresses of the {compute_service} nodes that are connected to the `ctlplane` and `internalapi` networks. Do not specify a real FQDN defined for each network. Use the same host name for each of its connected networks. Provide the IP addresses and the names of the hosts on the remaining networks of the source cloud as needed. Or you can manually adjust the files that you generate in step 9 of this procedure.
135+
* `NODESETS="'openstack-${CELL}', $NODESETS"` specifies the cells that contain Compute nodes. Cells that do not contain Compute nodes are omitted from this template because no node sets are created for the cells.
136136
+
137137
[NOTE]
138138
====
@@ -224,15 +224,15 @@ apiVersion: v1
224224
kind: ConfigMap
225225
metadata:
226226
name: nova-cells-global-config
227-
data: <1>
228-
99-nova-compute-cells-workarounds.conf: | <2>
227+
data:
228+
99-nova-compute-cells-workarounds.conf: |
229229
[workarounds]
230230
disable_compute_service_check_for_ffu=true
231231
EOF
232232
----
233233
+
234-
<1> The `data` resources in the `ConfigMap` provide the configuration files for all the cells.
235-
<2> There is a requirement to index the `<*.conf>` files from '03' to '99', based on precedence. A `<99-*.conf>` file takes the highest precedence, while indexes below '03' are reserved for internal use.
234+
* `data` provides the configuration files for all the cells.
235+
* `99-nova-compute-cells-workarounds.conf: |` specifies the index of the `<*.conf>` files. There is a requirement to index the `<*.conf>` files from '03' to '99', based on precedence. A `<99-*.conf>` file takes the highest precedence, while indexes below '03' are reserved for internal use.
236236
+
237237
[NOTE]
238238
If you adopt a live cloud, you might be required to carry over additional configurations for the default `nova` data plane services that are stored in the cell1 default `nova-extra-config` configuration map. Do not delete or overwrite the existing configuration in the `cell1` default `nova-extra-config` configuration map that is assigned to `nova`. Overwriting the configuration can break the data place services that rely on specific contents of the `nova-extra-config` configuration map.
@@ -276,11 +276,11 @@ $ for CELL in $(echo $RENAMED_CELLS); do
276276
> metadata:
277277
> name: nova-$CELL
278278
> spec:
279-
> dataSources: <1>
279+
> dataSources:
280280
> - secretRef:
281-
> name: nova-$CELL-compute-config <2>
281+
> name: nova-$CELL-compute-config
282282
> - secretRef:
283-
> name: nova-migration-ssh-key <3>
283+
> name: nova-migration-ssh-key
284284
> - configMapRef:
285285
> name: nova-cells-global-config
286286
> playbook: osp.edpm.nova
@@ -293,25 +293,10 @@ $ for CELL in $(echo $RENAMED_CELLS); do
293293
> done
294294
----
295295
+
296-
* If TLS Everywhere is enabled, append the following content to the `OpenStackDataPlaneService` CR:
297-
+
298-
----
299-
tlsCerts:
300-
contents:
301-
- dnsnames
302-
- ips
303-
networks:
304-
- ctlplane
305-
issuer: osp-rootca-issuer-internal
306-
edpmRoleServiceName: nova
307-
caCerts: combined-ca-bundle
308-
edpmServiceType: nova
309-
----
310-
+
311-
<1> To enable a local metadata service for cell<X>, append a `spec.dataSources.secretRef` to reference an additional auto-generated `nova-cell<X>-metadata-neutron-config` secret. You should also set
296+
* `spec.dataSources.secretRef` specifies an additional auto-generated `nova-cell<X>-metadata-neutron-config` secret to enable a local metadata service for cell<X>. You should also set
312297
`spec.nova.template.cellTemplates.cell<X>.metadataServiceTemplate.enable` in the `OpenStackControlPlane/openstack` CR, as described in xref:adopting-the-compute-service_{context}[Adopting the Compute service]. You can configure a single top-level metadata, or define the metadata per cell.
313-
<2> The secret `nova-cell<X>-compute-config` auto-generates for each `cell<X>`.
314-
<3> You must append the `nova-cell<X>-compute-config` and `nova-migration-ssh-key` references for each custom `OpenStackDataPlaneService` CR that is related to the {compute_service}.
298+
* `nova-$CELL-compute-config` specifies thr secret that auto-generates for each `cell<X>`. You must append the `nova-cell<X>-compute-config` for each custom `OpenStackDataPlaneService` CR that is related to the {compute_service}.
299+
* `nova-migration-ssh-key` spcecifies the secret that you must reference for each custom `OpenStackDataPlaneService` CR that is related to the {compute_service}.
315300
+
316301
[NOTE]
317302
====
@@ -325,6 +310,21 @@ the safest option is to create a custom service and a dedicated configuration ma
325310
* Different configurations for nodes in multiple node sets of the same cell are also supported, but are not covered in this guide.
326311
====
327312

313+
. If TLS Everywhere is enabled, append the following content to the `OpenStackDataPlaneService` CR:
314+
+
315+
----
316+
tlsCerts:
317+
contents:
318+
- dnsnames
319+
- ips
320+
networks:
321+
- ctlplane
322+
issuer: osp-rootca-issuer-internal
323+
edpmRoleServiceName: nova
324+
caCerts: combined-ca-bundle
325+
edpmServiceType: nova
326+
----
327+
328328
ifeval::["{build}" == "downstream"]
329329
. Create a secret for the subscription manager:
330330
+
@@ -369,10 +369,10 @@ $ for CELL in $(echo $RENAMED_CELLS); do
369369
ip_api="${ref_api}['$compute']"
370370
cat >> computes-$CELL << EOF
371371
${compute}:
372-
hostName: $compute <1>
372+
*hostName: $compute*
373373
ansible:
374374
ansibleHost: $compute
375-
networks: <2>
375+
*networks:*
376376
- defaultRoute: true
377377
fixedIP: ${!ip}
378378
name: ctlplane
@@ -393,13 +393,13 @@ EOF
393393
apiVersion: dataplane.openstack.org/v1beta1
394394
kind: OpenStackDataPlaneNodeSet
395395
metadata:
396-
name: openstack-$CELL <3>
396+
*name: openstack-$CELL*
397397
spec:
398-
tlsEnabled: false <4>
398+
*tlsEnabled: false*
399399
networkAttachments:
400400
- ctlplane
401401
preProvisioned: true
402-
services:
402+
*services*:
403403
ifeval::["{build}" == "downstream"]
404404
- redhat
405405
endif::[]
@@ -417,7 +417,7 @@ endif::[]
417417
- neutron-metadata
418418
- libvirt
419419
- nova-$CELL
420-
- telemetry <5>
420+
- telemetry
421421
env:
422422
- name: ANSIBLE_CALLBACKS_ENABLED
423423
value: "profile_tasks"
@@ -494,15 +494,15 @@ endif::[]
494494
#
495495
# These vars are for the network config templates themselves and are
496496
# considered EDPM network defaults.
497-
neutron_physical_bridge_name: br-ctlplane <6>
497+
*neutron_physical_bridge_name: br-ctlplane*
498498
neutron_public_interface_name: eth0
499499
500500
# edpm_nodes_validation
501501
edpm_nodes_validation_validate_controllers_icmp: false
502502
edpm_nodes_validation_validate_gateway_icmp: false
503503
504504
# edpm ovn-controller configuration
505-
edpm_ovn_bridge_mappings: <bridge_mappings> <7>
505+
*edpm_ovn_bridge_mappings: <bridge_mappings>*
506506
edpm_ovn_bridge: br-int
507507
edpm_ovn_encap_type: geneve
508508
ovn_monitor_all: true
@@ -553,9 +553,9 @@ endif::[]
553553
# Do not attempt OVS major upgrades here
554554
edpm_ovs_packages:
555555
- openvswitch3.3
556-
edpm_default_mounts: <8>
557-
- path: /dev/hugepages<size>
558-
opts: pagesize=<size>
556+
edpm_default_mounts:
557+
-*path: /dev/hugepages<size>*
558+
*opts: pagesize=<size>*
559559
fstype: hugetlbfs
560560
group: hugetlbfs
561561
nodes:
@@ -564,14 +564,14 @@ EOF
564564
done
565565
----
566566
+
567-
<1> If your deployment has a custom DNS Domain, specify the FQDN for the node.
568-
<2> The network composition must match the source cloud configuration to avoid data plane connectivity downtime. The `ctlplane` network must come first. The commands only retain IP addresses for the hosts on the `ctlplane` and `internalapi` networks. Repeat this step for other isolated networks, or update the resulting files manually.
569-
<3> Use node sets names, such as `openstack-cell1`, `openstack-cell2`. Only create node sets for cells that contain Compute nodes.
570-
<4> If TLS Everywhere is enabled, change `tlsEnabled` to `true`.
571-
<5> If you are not adopting telemetry services, omit it from the services list.
572-
<6> The bridge name and other OVN and {networking_service}-specific values must match the source cloud configuration to avoid data plane connectivity downtime.
573-
<7> Replace `<bridge_mappings>` with the value of the bridge mappings in your configuration, for example, `"datacentre:br-ctlplane"`.
574-
<8> To configure huge pages, replace `<size>` with the size of the page. To configure multi-sized huge pages, create more items in the list. Note that the mount points must match the source cloud configuration.
567+
* `${compute}.hostName` specifies the FQDN for the node if your deployment has a custom DNS Domain.
568+
* `${compute}.networks` specifies the network composition. The network composition must match the source cloud configuration to avoid data plane connectivity downtime. The `ctlplane` network must come first. The commands only retain IP addresses for the hosts on the `ctlplane` and `internalapi` networks. Repeat this step for other isolated networks, or update the resulting files manually.
569+
* `metadata.name:` specifies the node set names for each cell, for example, `openstack-cell1`, `openstack-cell2`. Only create node sets for cells that contain Compute nodes.
570+
* `spec.tlsEnabled` specifies whether TLS Everywhere is enabled. If it is enabled, change `tlsEnabled` to `true`.
571+
* `spec.services` specifies the services to be adopted. If you are not adopting telemetry services, omit it from the services list.
572+
* `neutron_physical_bridge_name: br-ctlplane` specifies the bridge name. The bridge name and other OVN and {networking_service}-specific values must match the source cloud configuration to avoid data plane connectivity downtime.
573+
*`edpm_ovn_bridge_mappings: <bridge_mappings>` specifies the value of the bridge mappings in your configuration, for example, `"datacentre:br-ctlplane"`.
574+
* `path: /dev/hugepages<size>` and `opts: pagesize=<size>` configures huge pages. Replace `<size>` with the size of the page. To configure multi-sized huge pages, create more items in the list. Note that the mount points must match the source cloud configuration.
575575
+
576576
[NOTE]
577577
====

docs_user/modules/proc_adopting-image-service-with-block-storage-backend.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,17 @@ spec:
7272
annotations:
7373
metallb.universe.tf/address-pool: internalapi
7474
metallb.universe.tf/allow-shared-ip: internalapi
75-
metallb.universe.tf/loadBalancerIPs: 172.17.0.80 <1>
75+
*metallb.universe.tf/loadBalancerIPs: <172.17.0.80>*
7676
spec:
7777
type: LoadBalancer
7878
networkAttachments:
7979
- storage
8080
----
8181
+
82-
<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`.
82+
where:
83+
84+
<172.17.0.80>::
85+
Specifies the load balancer IP. 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`.
8386
+
8487
[NOTE]
8588
The {block_storage} as a back end establishes a dependency with the {image_service}. Any deployed `GlanceAPI` instances do not work if the {image_service} is configured with the {block_storage} that is not available in the `OpenStackControlPlane` custom resource.

docs_user/modules/proc_adopting-image-service-with-ceph-backend.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,18 @@ spec:
4242
annotations:
4343
metallb.universe.tf/address-pool: internalapi
4444
metallb.universe.tf/allow-shared-ip: internalapi
45-
metallb.universe.tf/loadBalancerIPs: 172.17.0.80 <1>
45+
*metallb.universe.tf/loadBalancerIPs: <172.17.0.80>*
4646
spec:
4747
type: LoadBalancer
4848
networkAttachments:
4949
- storage
5050
EOF
5151
----
5252
+
53-
<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`.
53+
where:
54+
55+
<172.17.0.80>::
56+
Specifies the load balancer IP. 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`.
5457

5558
[NOTE]
5659
====

docs_user/modules/proc_comparing-configuration-files-between-deployments.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dnf install -y golang-github-openstack-k8s-operators-os-diff
2222

2323
. Configure the `/etc/os-diff/os-diff.cfg` file and the `/etc/os-diff/ssh.config` file according to your environment. To allow os-diff to connect to your clouds and pull files from the services that you describe in the `config.yaml` file, you must set the following options in the `os-diff.cfg` file:
2424
+
25-
[source,yaml]
2625
[subs=+quotes]
2726
----
2827
[Default]
@@ -32,8 +31,8 @@ service_config_file=config.yaml
3231
3332
[Tripleo]
3433
35-
ssh_cmd=ssh -F ssh.config <1>
36-
director_host=standalone <2>
34+
*ssh_cmd=ssh -F ssh.config*
35+
*director_host=standalone*
3736
container_engine=podman
3837
connection=ssh
3938
remote_config_path=/tmp/tripleo
@@ -46,8 +45,8 @@ connection=local
4645
ssh_cmd=""
4746
----
4847
+
49-
<1> Instructs os-diff to access your {OpenStackPreviousInstaller} host through SSH. The default value is `ssh -F ssh.config`. However, you can set the value without an ssh.config file, for example, `ssh -i /home/user/.ssh/id_rsa [email protected]`.
50-
<2> The host to use to access your cloud, and the podman/docker binary is installed and allowed to interact with the running containers. You can leave this key blank.
48+
*`ssh_cmd=ssh -F ssh.config` instructs os-diff to access your {OpenStackPreviousInstaller} host through SSH. The default value is `ssh -F ssh.config`. However, you can set the value without an ssh.config file, for example, `ssh -i /home/user/.ssh/id_rsa [email protected]`.
49+
*`director_host=standalone` specifies the host to use to access your cloud, and the podman/docker binary is installed and allowed to interact with the running containers. You can leave this key blank.
5150

5251
. If you use a host file to connect to your cloud, configure the `ssh.config` file to allow os-diff to access your {OpenStackShort} environment, for example:
5352
+

0 commit comments

Comments
 (0)