Skip to content

Commit 503fbfd

Browse files
committed
OCP 4.17: IBM Power Virtual Server using installer-provisioned infrastructure
1 parent faf4bd3 commit 503fbfd

5 files changed

+31
-17
lines changed

modules/installation-about-restricted-network.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ifeval::["{context}" == "installing-ibm-cloud-restricted"]
2626
endif::[]
2727
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
2828
:ipi:
29+
:ipi-powervs:
2930
endif::[]
3031
ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
3132
:ipi:
@@ -53,6 +54,13 @@ endif::[]
5354
In {product-title} {product-version}, you can perform an installation that does not
5455
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.
5556

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+
5664
ifndef::ibm-power,ibm-cloud[]
5765
If you choose to perform a restricted network installation on a cloud platform, you
5866
still require access to its cloud APIs. Some cloud functions, like
@@ -146,6 +154,7 @@ ifeval::["{context}" == "installing-ibm-cloud-restricted"]
146154
endif::[]
147155
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
148156
:!ipi:
157+
:!ipi-powervs:
149158
endif::[]
150159
ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
151160
:!ipi:

modules/installation-ibm-cloud-regions.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,14 @@ ifdef::ibm-power-vs[]
6565
** `wdc06`
6666
** `wdc07`
6767
68-
You might optionally specify the {ibm-cloud-name} region in which the installer will create any VPC components. Supported regions in {ibm-cloud-name} are:
68+
You might optionally specify the {ibm-cloud-name} region in which the installation program creates any VPC components.
69+
70+
[NOTE]
71+
====
72+
If you do not specify the region, the installation program selects the region closest to {ibm-power-server-title} zone you are deploying to.
73+
====
74+
75+
{ibm-cloud-name} supports the following regions:
6976

7077
* `us-south`
7178
* `eu-de`

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ platform:
149149
powervsResourceGroup: "ibmcloud-resource-group"
150150
region: powervs-region
151151
vpcName: name-of-existing-vpc <7>
152-
vpcSubnets:
153-
- powervs-region-example-subnet-1
154152
vpcRegion : vpc-region
155153
zone: powervs-zone
156154
serviceInstanceGUID: "powervs-region-service-instance-guid"
@@ -238,15 +236,13 @@ platform:
238236
region: powervs-region
239237
vpcRegion : vpc-region
240238
vpcName: name-of-existing-vpc <7>
241-
vpcSubnets: <8>
242-
- powervs-region-example-subnet-1
243239
zone: powervs-zone
244240
serviceInstanceGUID: "powervs-region-service-instance-guid"
245241
credentialsMode: Manual
246-
publish: External <9>
247-
pullSecret: '{"auths": ...}' <10>
242+
publish: External <8>
243+
pullSecret: '{"auths": ...}' <9>
248244
fips: false
249-
sshKey: ssh-ed25519 AAAA... <11>
245+
sshKey: ssh-ed25519 AAAA... <10>
250246
----
251247
<1> If you do not provide these parameters and values, the installation program provides the default value.
252248
<2> The `controlPlane` section is a single mapping, but the compute section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Both sections currently define a single machine pool. Only one control plane pool is used.
@@ -260,10 +256,9 @@ When simultaneous multithreading (SMT), or hyperthreading is not enabled, one vC
260256
<5> The machine CIDR must contain the subnets for the compute machines and control plane machines.
261257
<6> The cluster network plugin for installation. The supported value is `OVNKubernetes`.
262258
<7> Specify the name of an existing VPC.
263-
<8> 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.
264-
<9> Specify how to publish the user-facing endpoints of your cluster.
265-
<10> Required. The installation program prompts you for this value.
266-
<11> Provide the `sshKey` value that you use to access the machines in your cluster.
259+
<8> Specify how to publish the user-facing endpoints of your cluster.
260+
<9> Required. The installation program prompts you for this value.
261+
<10> Provide the `sshKey` value that you use to access the machines in your cluster.
267262
+
268263
[IMPORTANT]
269264
====

modules/installation-initializing.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ endif::[]
106106
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
107107
:ibm-power-vs:
108108
endif::[]
109+
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
110+
:ibm-power-vs:
111+
endif::[]
109112
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
110113
:ibm-power-vs:
111114
:restricted:
@@ -243,7 +246,9 @@ $ ./openshift-install create install-config --dir <installation_directory> <1>
243246
files that the installation program creates.
244247
+
245248
When specifying the directory:
249+
ifndef::ibm-power-vs[]
246250
* Verify that the directory has the `execute` permission. This permission is required to run Terraform binaries under the installation directory.
251+
endif::ibm-power-vs[]
247252
* Use an empty directory. Some installation assets, such as bootstrap X.509 certificates, have short expiration intervals, therefore you must not reuse an installation directory. If you want to reuse individual files from another cluster installation, you can copy them into your directory. However, the file names for the installation assets might change between releases. Use caution when copying installation files from an earlier {product-title} version.
248253
ifdef::ibm-power-vs[]
249254
+
@@ -699,6 +704,9 @@ endif::[]
699704
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
700705
:!ibm-power-vs:
701706
endif::[]
707+
ifeval::["{context}" == "installing-ibm-powervs-vpc"]
708+
:!ibm-power-vs:
709+
endif::[]
702710
ifeval::["{context}" == "installing-restricted-networks-ibm-power-vs"]
703711
:!ibm-power-vs:
704712
:!restricted:

modules/quotas-and-limits-ibm-power-vs.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ Each {product-title} cluster creates its own Transit Gateway to enable communica
3737

3838
There is a limit of one Dynamic Host Configuration Protocol (DHCP) service per {ibm-power-server-name} instance.
3939

40-
[discrete]
41-
== Networking
42-
43-
Due to networking limitations, there is a restriction of one OpenShift cluster installed through IPI per zone per account. This is not configurable.
44-
4540
[discrete]
4641
== Virtual Server Instances
4742

0 commit comments

Comments
 (0)