Skip to content

Commit 379b94d

Browse files
Merge pull request #93690 from alishaIBM/4.19-disconnected-ipi
OCP 4.19 IPI in a disconnected environment
2 parents df30cf8 + 9963a34 commit 379b94d

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

modules/installation-about-restricted-network.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ endif::[]
5454
In {product-title} {product-version}, you can perform an installation that does not
5555
require an active connection to the internet to obtain software components. Restricted network installations can be completed using installer-provisioned infrastructure or user-provisioned infrastructure, depending on the cloud platform to which you are installing the cluster.
5656

57-
ifdef::ipi-powervs[]
58-
[NOTE]
59-
====
60-
For installer-provisioned infrastructure in {product-title} {product-version}, you need to deploy your restricted network cluster in {product-title} 4.16 and upgrade it to {product-title} {product-version}.
61-
====
62-
endif::ipi-powervs[]
63-
6457
ifndef::ibm-power,ibm-cloud[]
6558
If you choose to perform a restricted network installation on a cloud platform, you
6659
still require access to its cloud APIs. Some cloud functions, like

modules/installation-ibm-power-vs-config-yaml.adoc

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -322,19 +322,17 @@ platform:
322322
region: "powervs-region"
323323
vpcRegion: "vpc-region"
324324
vpcName: name-of-existing-vpc <10>
325-
vpcSubnets: <11>
326-
- name-of-existing-vpc-subnet
327325
zone: "powervs-zone"
328326
serviceInstanceID: "service-instance-id"
329327
publish: Internal
330328
credentialsMode: Manual
331-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "you@example.com"}}}' <12>
332-
sshKey: ssh-ed25519 AAAA... <13>
333-
additionalTrustBundle: | <14>
329+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "you@example.com"}}}' <11>
330+
sshKey: ssh-ed25519 AAAA... <12>
331+
additionalTrustBundle: | <13>
334332
-----BEGIN CERTIFICATE-----
335333
<MY_TRUSTED_CA_CERT>
336334
-----END CERTIFICATE-----
337-
imageContentSources: <15>
335+
imageContentSources: <14>
338336
- mirrors:
339337
- <local_registry>/<local_repository_name>/release
340338
source: quay.io/openshift-release-dev/ocp-release
@@ -362,11 +360,10 @@ When simultaneous multithreading (SMT), or hyperthreading is not enabled, one vC
362360
<8> The cluster network plugin to install. The default value `OVNKubernetes` is the only supported value.
363361
<9> The name of an existing resource group. The existing VPC and subnets should be in this resource group. The cluster is deployed to this resource group.
364362
<10> Specify the name of an existing VPC.
365-
<11> Specify the name of the existing VPC subnet. The subnets must belong to the VPC that you specified. Specify a subnet for each availability zone in the region.
366-
<12> For `<local_registry>`, specify the registry domain name, and optionally the port, that your mirror registry uses to serve content. For example, registry.example.com or registry.example.com:5000. For `<credentials>`, specify the base64-encoded user name and password for your mirror registry.
367-
<13> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
368-
<14> Provide the contents of the certificate file that you used for your mirror registry.
369-
<15> Provide the `imageContentSources` section from the output of the command to mirror the repository.
363+
<11> For `<local_registry>`, specify the registry domain name, and optionally the port, that your mirror registry uses to serve content. For example, registry.example.com or registry.example.com:5000. For `<credentials>`, specify the base64-encoded user name and password for your mirror registry.
364+
<12> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
365+
<13> Provide the contents of the certificate file that you used for your mirror registry.
366+
<14> Provide the `imageContentSources` section from the output of the command to mirror the repository.
370367
+
371368
[NOTE]
372369
====

modules/installation-initializing.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,15 +513,14 @@ For `platform.gcp.network`, specify the name for the existing Google VPC. For `p
513513
endif::gcp+restricted[]
514514
515515
ifdef::ibm-power-vs+restricted[]
516-
.. Define the network and subnets for the VPC to install the cluster in under the parent `platform.powervs` field:
516+
.. Define the network for the VPC to install the cluster in under the parent `platform.powervs` field:
517517
+
518518
[source,yaml]
519519
----
520520
vpcName: <existing_vpc>
521-
vpcSubnets: <vpcSubnet>
522521
----
523522
+
524-
For `platform.powervs.vpcName`, specify the name for the existing {ibm-cloud-name}. For `platform.powervs.vpcSubnets`, specify the existing subnets.
523+
For `platform.powervs.vpcName`, specify the name for the existing {ibm-cloud-name} VPC.
525524
endif::ibm-power-vs+restricted[]
526525
ifdef::ibm-cloud+restricted[]
527526
.. Define the network and subnets for the VPC to install the cluster in under the parent `platform.ibmcloud` field:
@@ -587,7 +586,7 @@ Only one VPE can be specified per service.
587586
====
588587
endif::ibm-cloud[]
589588
ifdef::restricted[]
590-
.. Optional: Set the publishing strategy to `Internal`:
589+
.. Set the publishing strategy to `Internal`:
591590
+
592591
[source,yaml]
593592
----

0 commit comments

Comments
 (0)