Skip to content

Commit 2eaa743

Browse files
authored
Merge pull request #70885 from alishaIBM/ipi_update_5
OCP 4.15: IPI for PowerVS updates
2 parents b1152a8 + 919d9fb commit 2eaa743

5 files changed

+25
-43
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ ifdef::ibm-power-vs[]
177177
|Specifies the {ibm-cloud-name} colo region where the cluster will be created.
178178
|String. For example, `existing_zone`.
179179

180-
|platform:
181-
powervs:
182-
serviceInstanceID:
183-
|The ServiceInstanceID is the ID of the Power IAAS instance created from the {ibm-cloud-name} Catalog.
184-
|String. For example, `existing_service_instance_ID`.
185180
endif::ibm-power-vs[]
186181
|====
187182

@@ -515,6 +510,12 @@ accounts for the dramatically decreased machine performance.
515510
====
516511
|`Enabled` or `Disabled`
517512
endif::vsphere[]
513+
ifdef::ibm-power-vs[]
514+
|compute:
515+
smtLevel:
516+
|The SMTLevel specifies the level of SMT to set to the control plane and compute machines. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, `off`, and `on`.
517+
|String
518+
endif::ibm-power-vs[]
518519

519520
|compute:
520521
name:
@@ -726,9 +727,9 @@ ifdef::ibm-power-vs[]
726727

727728
|platform:
728729
powervs:
729-
cloudConnectionName:
730-
|The CloudConnectionName is the name of an existing PowerVS Cloud connection.
731-
|String. For example, `existing_cloudConnectionName`.
730+
serviceInstanceGUID:
731+
|The ServiceInstanceGUID is the ID of the Power IAAS instance created from the {ibm-cloud-name} Catalog.
732+
|String. For example, `existing_service_instance_GUID`.
732733

733734
|platform:
734735
powervs:
@@ -785,13 +786,6 @@ ifdef::aws,gcp,azure[]
785786
Setting this parameter to `Manual` enables alternatives to storing administrator-level secrets in the `kube-system` project, which require additional configuration steps. For more information, see "Alternatives to storing administrator-level secrets in the kube-system project".
786787
====
787788
endif::aws,gcp,azure[]
788-
ifdef::ibm-power-vs[]
789-
+
790-
[NOTE]
791-
====
792-
Cloud connections are no longer supported in the `install-config.yaml` while deploying in the `dal10` region, as they have been replaced by the Power Edge Router (PER).
793-
====
794-
endif::ibm-power-vs[]
795789
--
796790

797791
ifdef::aws[]

modules/installation-ibm-cloud-iam-policies-api-key.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ ifdef::ibm-power-vs[]
114114
|<resource_group> (Resource Group Created for Your Team)
115115

116116
|Viewer, Operator, Editor, Reader, Writer, Manager
117-
|All service in Default resource group
117+
|All Identity and IAM enabled services in Default resource group
118118

119119
|Viewer, Reader
120120
|Internet Services service
@@ -126,13 +126,13 @@ ifdef::ibm-power-vs[]
126126
|Default resource group: The resource type should equal `Resource group`, with a value of `Default`. If your account administrator changed your account's default resource group to something other than Default, use that value instead.
127127

128128
|Viewer, Operator, Editor, Reader, Manager
129-
|{ibm-power-server-name} service in <resource_group> resource group
129+
|Workspace for {ibm-power-server-name} service in <resource_group> resource group
130130

131131
|Viewer, Operator, Editor, Reader, Writer, Manager, Administrator
132132
|Internet Services service in <resource_group> resource group: CIS functional scope string equals reliability
133133

134134
|Viewer, Operator, Editor
135-
|Direct Link service
135+
|Transit Gateway service
136136

137137
|Viewer, Operator, Editor, Administrator, Reader, Writer, Manager, Console Administrator
138138
|VPC Infrastructure Services service <resource_group> resource group

modules/installation-ibm-cloud-regions.adoc

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,23 @@ ifdef::ibm-power-vs[]
4040
* `dal` (Dallas, USA)
4141
** `dal10`
4242
** `dal12`
43-
* `us-east` (Washington DC, USA)
44-
** `us-east`
4543
* `eu-de` (Frankfurt, Germany)
4644
** `eu-de-1`
4745
** `eu-de-2`
48-
* `lon` (London, UK)
49-
** `lon04`
50-
** `lon06`
51-
* `osa` (Osaka, Japan)
52-
** `osa21`
46+
* `mad` (Madrid, Spain)
47+
** `mad02`
48+
** `mad04`
5349
* `sao` (Sao Paulo, Brazil)
54-
** `sao01`
55-
* `syd` (Sydney, Australia)
56-
** `syd04`
57-
* `tok` (Tokyo, Japan)
58-
** `tok04`
59-
* `tor` (Toronto, Canada)
60-
** `tor01`
50+
** `sao04`
51+
* `wdc` (Washington DC, USA)
52+
** `wdc06`
53+
** `wdc07`
6154
6255
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:
6356

6457
* `us-south`
6558
* `eu-de`
59+
* `eu-es`
6660
* `eu-gb`
6761
* `jp-osa`
6862
* `au-syd`

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ platform:
6464
region: powervs-region
6565
zone: powervs-zone
6666
powervsResourceGroup: "ibmcloud-resource-group" <5>
67-
serviceInstanceID: "powervs-region-service-instance-id"
67+
serviceInstanceGUID: "powervs-region-service-instance-guid"
6868
vpcRegion : vpc-region
6969
publish: External
7070
pullSecret: '{"auths": ...}' <6>
@@ -135,12 +135,11 @@ platform:
135135
powervsResourceGroup: "ibmcloud-resource-group"
136136
region: powervs-region
137137
vpcName: name-of-existing-vpc <6>
138-
cloudConnectionName: powervs-region-example-cloud-con-priv
139138
vpcSubnets:
140139
- powervs-region-example-subnet-1
141140
vpcRegion : vpc-region
142141
zone: powervs-zone
143-
serviceInstanceID: "powervs-region-service-instance-id"
142+
serviceInstanceGUID: "powervs-region-service-instance-guid"
144143
publish: Internal <7>
145144
pullSecret: '{"auths": ...}' <8>
146145
sshKey: ssh-ed25519 AAAA... <9>
@@ -218,7 +217,7 @@ platform:
218217
vpcSubnets: <7>
219218
- powervs-region-example-subnet-1
220219
zone: powervs-zone
221-
serviceInstanceID: "powervs-region-service-instance-id"
220+
serviceInstanceGUID: "powervs-region-service-instance-guid"
222221
credentialsMode: Manual
223222
publish: External <8>
224223
pullSecret: '{"auths": ...}' <9>

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,9 @@ You can create additional `LoadBalancer` service objects to create additional AL
2828
VPC ALBs are supported. Classic ALBs are not supported for {ibm-power-server-name}.
2929

3030
[discrete]
31-
== Cloud connections
31+
== Transit Gateways
3232

33-
There is a limit of two cloud connections per {ibm-power-server-name} instance. It is recommended that you have only one cloud connection in your {ibm-power-server-name} instance to serve your cluster.
34-
35-
[NOTE]
36-
====
37-
Cloud Connections are no longer supported in `dal10`. A transit gateway is used instead.
38-
====
33+
Each {product-title} cluster creates its own Transit Gateway to enable communication with a VPC. The default quota of transit gateways per account is 10. If you have 10 transit gateways created, you will need to increase your quota before attempting an installation.
3934

4035
[discrete]
4136
== Dynamic Host Configuration Protocol Service

0 commit comments

Comments
 (0)