Skip to content

Commit 53707cc

Browse files
authored
Merge pull request #60084 from kalexand-rh/4.13_build_errors
fixing build warnings/errors
2 parents c0263a3 + 6793feb commit 53707cc

23 files changed

+125
-121
lines changed

installing/installing_openstack/installing-openstack-installer-custom.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ See xref:../installing_openstack/installing-openstack-installer-custom.adoc#inst
3737

3838
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
3939
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
40-
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+3]
4140
include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
4241
include::modules/installation-osp-deploying-bare-metal-machines.adoc[leveloffset=+2]
4342
include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]
@@ -52,6 +51,7 @@ After you deploy your cluster, you can attach pods to additional networks. For m
5251
====
5352

5453
include::modules/installation-osp-config-yaml.adoc[leveloffset=+2]
54+
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+2]
5555
include::modules/installation-osp-external-lb-config.adoc[leveloffset=+2]
5656
// include::modules/installation-osp-setting-worker-affinity.adoc[leveloffset=+1]
5757
include::modules/ssh-agent-using.adoc[leveloffset=+1]

installing/installing_openstack/installing-openstack-installer-kuryr.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
4040
include::modules/installation-initializing.adoc[leveloffset=+1]
4141
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
4242
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
43-
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+3]
4443
include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
4544
include::modules/installation-osp-kuryr-config-yaml.adoc[leveloffset=+2]
45+
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+2]
4646
include::modules/installation-osp-external-lb-config.adoc[leveloffset=+2]
4747
include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]
4848
include::modules/installation-osp-provider-network-preparation.adoc[leveloffset=+3]

installing/installing_openstack/installing-openstack-installer-restricted.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include::modules/installation-osp-bootstrap-machine.adoc[leveloffset=+2]
2929
include::modules/cluster-entitlements.adoc[leveloffset=+1]
3030
include::modules/installation-osp-enabling-swift.adoc[leveloffset=+1]
3131
include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
32-
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+3]
32+
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+2]
3333
include::modules/installation-osp-setting-cloud-provider-options.adoc[leveloffset=+1]
3434
include::modules/installation-creating-image-restricted.adoc[leveloffset=+1]
3535
include::modules/installation-initializing.adoc[leveloffset=+1]

installing/installing_openstack/installing-openstack-user-kuryr.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
4646
include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
4747
include::modules/installation-initializing.adoc[leveloffset=+1]
4848
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
49-
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+3]
5049
include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
5150
include::modules/installation-osp-kuryr-config-yaml.adoc[leveloffset=+2]
51+
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+2]
5252
include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]
5353
include::modules/installation-osp-provider-network-preparation.adoc[leveloffset=+3]
5454
include::modules/installation-osp-deploying-provider-networks-installer.adoc[leveloffset=+3]

installing/installing_openstack/installing-openstack-user.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
3838
include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
3939
include::modules/installation-initializing.adoc[leveloffset=+1]
4040
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
41-
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+3]
4241
include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
4342
include::modules/installation-osp-config-yaml.adoc[leveloffset=+2]
43+
include::modules/installation-osp-failure-domains-config.adoc[leveloffset=+2]
4444
include::modules/installation-osp-fixing-subnet.adoc[leveloffset=+2]
4545
include::modules/installation-osp-emptying-worker-pools.adoc[leveloffset=+2]
4646
include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]

logging/v5_5/logging-5-5-configuration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ include::snippets/logging-crs-by-operator-snip.adoc[]
1010

1111
include::snippets/logging-supported-config-snip.adoc[]
1212

13-
include::modules/logging-multiline-except.adoc[leveoffset=+1]
13+
include::modules/logging-multiline-except.adoc[leveloffset=+1]

logging/v5_6/logging-5-6-configuration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ include::snippets/logging-crs-by-operator-snip.adoc[]
1010

1111
include::snippets/logging-supported-config-snip.adoc[]
1212

13-
include::modules/logging-loki-retention.adoc[leveoffset=+1]
13+
include::modules/logging-loki-retention.adoc[leveloffset=+1]
1414

15-
include::modules/logging-multiline-except.adoc[leveoffset=+1]
15+
include::modules/logging-multiline-except.adoc[leveloffset=+1]

logging/v5_7/logging-5-7-configuration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ include::snippets/logging-crs-by-operator-snip.adoc[]
1010

1111
include::snippets/logging-supported-config-snip.adoc[]
1212

13-
include::modules/logging-loki-retention.adoc[leveoffset=+1]
13+
include::modules/logging-loki-retention.adoc[leveloffset=+1]
1414

15-
include::modules/logging-multiline-except.adoc[leveoffset=+1]
15+
include::modules/logging-multiline-except.adoc[leveloffset=+1]

modules/custom-tuning-specification.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ifdef::rosa-hcp-tuning[]
8989
"recommend": [
9090
{
9191
"recommend-item-1": details_of_recommendation,
92-
# ...
92+
# ...
9393
"recommend-item-n": details_of_recommendation,
9494
}
9595
]
@@ -147,10 +147,10 @@ ifdef::rosa-hcp-tuning[]
147147
}
148148
----
149149
<1> Profile ordering priority. Lower numbers mean higher priority (`0` is the highest priority).
150-
<1> A TuneD profile to apply on a match. For example `tuned_profile_1`.
151-
<1> Optional: A dictionary of key-value pairs `MachineConfig` labels. The keys must be unique.
152-
<1> If omitted, profile match is assumed unless a profile with a higher priority matches first or `machineConfigLabels` is set.
153-
<1> The label for the profile matched items.
150+
<2> A TuneD profile to apply on a match. For example `tuned_profile_1`.
151+
<3> Optional: A dictionary of key-value pairs `MachineConfig` labels. The keys must be unique.
152+
<4> If omitted, profile match is assumed unless a profile with a higher priority matches first or `machineConfigLabels` is set.
153+
<5> The label for the profile matched items.
154154
endif::[]
155155

156156
`<match>` is an optional list recursively defined as follows:

modules/installation-osp-failure-domains-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id="installation-osp-failure-domains-config_{context}"]
7-
= An example installation configuration section that uses failure domains
7+
= Example installation configuration section that uses failure domains
88

99
:FeatureName: {rh-openstack} failure domains
1010
include::snippets/technology-preview.adoc[]

0 commit comments

Comments
 (0)