Skip to content

Commit 18be246

Browse files
committed
Fix ifdef errors in IBZ install docs
1 parent 8fb5135 commit 18be246

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

modules/installation-bare-metal-config-yaml.adoc

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ ifeval::["{context}" == "installing-ibm-power"]
2929
endif::[]
3030
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
3131
:ibm-power:
32+
:restricted:
3233
endif::[]
3334
ifeval::["{context}" == "installing-platform-agnostic"]
3435
:agnostic:
@@ -122,7 +123,7 @@ fips: false <11>
122123
endif::openshift-origin[]
123124
ifndef::restricted[]
124125
ifndef::openshift-origin[]
125-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <12>
126+
pullSecret: '{"auths": ...}' <12>
126127
endif::openshift-origin[]
127128
ifdef::openshift-origin[]
128129
pullSecret: '{"auths": ...}' <11>
@@ -156,11 +157,20 @@ additionalTrustBundle: | <14>
156157
-----END CERTIFICATE-----
157158
imageContentSources: <15>
158159
- mirrors:
160+
ifdef::ibm-z[]
161+
- <local_repository>/ocp4/openshift4
162+
source: quay.io/openshift-release-dev/ocp-release
163+
- mirrors:
164+
- <local_repository>/ocp4/openshift4
165+
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
166+
endif::ibm-z[]
167+
ifndef::ibm-z[]
159168
- <local_registry>/<local_repository_name>/release
160169
source: quay.io/openshift-release-dev/ocp-release
161170
- mirrors:
162171
- <local_registry>/<local_repository_name>/release
163172
source: registry.svc.ci.openshift.org/ocp/release
173+
endif::ibm-z[]
164174
endif::openshift-origin[]
165175
ifdef::openshift-origin[]
166176
additionalTrustBundle: | <13>
@@ -169,12 +179,6 @@ additionalTrustBundle: | <13>
169179
-----END CERTIFICATE-----
170180
imageContentSources: <14>
171181
- mirrors:
172-
- <local_registry>/<local_repository_name>/release
173-
source: quay.io/openshift-release-dev/ocp-release
174-
- mirrors:
175-
- <local_registry>/<local_repository_name>/release
176-
source: registry.svc.ci.openshift.org/ocp/release
177-
endif::openshift-origin[]
178182
ifdef::ibm-z[]
179183
- <local_repository>/ocp4/openshift4
180184
source: quay.io/openshift-release-dev/ocp-release
@@ -183,14 +187,13 @@ ifdef::ibm-z[]
183187
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
184188
endif::ibm-z[]
185189
ifndef::ibm-z[]
186-
ifndef::openshift-origin[]
187190
- <local_registry>/<local_repository_name>/release
188191
source: quay.io/openshift-release-dev/ocp-release
189192
- mirrors:
190193
- <local_registry>/<local_repository_name>/release
191194
source: registry.svc.ci.openshift.org/ocp/release
192-
endif::openshift-origin[]
193195
endif::ibm-z[]
196+
endif::openshift-origin[]
194197
endif::restricted[]
195198
----
196199
<1> The base domain of the cluster. All DNS records must be sub-domains of this
@@ -237,13 +240,8 @@ ifndef::openshift-origin[]
237240
<11> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
238241
endif::openshift-origin[]
239242
ifndef::restricted[]
240-
ifdef::ibm-z,ibm-z-kvm[]
241-
<12> The pullSecret value contains the authentication information for your registry. For `<bastion_host_name>`, specify the registry domain name that you specified in the certificate for your mirror registry, and for `<credentials>`, specify the base64-encoded user name and password for your mirror registry.
242-
endif::ibm-z,ibm-z-kvm[]
243-
ifndef::ibm-z,ibm-z-kvm[]
244243
<12> The pull secret that you obtained from the
245244
link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {cloud-redhat-com} site.
246-
endif::ibm-z,ibm-z-kvm[]
247245
This pull secret allows you to authenticate with the services that are
248246
provided by the included authorities, including Quay.io, which serves the
249247
container images for {product-title} components.
@@ -253,10 +251,6 @@ ifdef::restricted[]
253251
port, that your mirror registry uses to serve content. For example
254252
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
255253
specify the base64-encoded user name and password for your mirror registry.
256-
<13> The pull secret that you obtained from the
257-
link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {cloud-redhat-com} site. This pull secret allows you to authenticate with the services that are
258-
provided by the included authorities, including Quay.io, which serves the
259-
container images for {product-title} components.
260254
endif::restricted[]
261255
ifndef::openshift-origin[]
262256
<13> The public portion of the default SSH key for the `core` user in

0 commit comments

Comments
 (0)