Skip to content

Commit 0e88631

Browse files
committed
add networking to ibm z
1 parent d911ae3 commit 0e88631

File tree

6 files changed

+71
-6
lines changed

6 files changed

+71
-6
lines changed

installing/installing_ibm_z/installing-ibm-z-kvm.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
5959

6060
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
6161

62+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
63+
6264
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
6365

6466
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
6567

6668
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
6769

70+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
71+
6872
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
6973

7074
include::modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc[leveloffset=+1]

installing/installing_ibm_z/installing-ibm-z.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,16 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
6565

6666
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
6767

68+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
69+
6870
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
6971

7072
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
7173

7274
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
7375

76+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
77+
7478
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
7579

7680
include::modules/installation-ibm-z-user-infra-machines-iso.adoc[leveloffset=+1]

installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,16 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
6565

6666
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
6767

68+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
69+
6870
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
6971

7072
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
7173

7274
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
7375

76+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
77+
7478
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
7579

7680
include::modules/installation-ibm-z-kvm-user-infra-installing-rhcos.adoc[leveloffset=+1]

installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ include::modules/installation-requirements-user-infra.adoc[leveloffset=+1]
4747

4848
.Additional resources
4949

50-
* See link:https://www.ibm.com/support/knowledgecenter/en/SSB27U_7.1.0/com.ibm.zvm.v710.hcpa6/bhslzvs.htm[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in the IBM Knowledge Center.
50+
* See link:https://www.ibm.com/docs/en/zvm/7.1?topic=networks-bridging-hipersockets-lan-zvm-virtual-switch[Bridging a HiperSockets LAN with a z/VM Virtual Switch] in IBM Documentation.
51+
5152
* See link:http://public.dhe.ibm.com/software/dw/linux390/perf/zvm_hpav00.pdf[Scaling HyperPAV alias devices on Linux guests on z/VM] for performance optimization.
5253

5354
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
@@ -72,12 +73,16 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
7273

7374
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
7475

76+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
77+
7578
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
7679

7780
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
7881

7982
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
8083

84+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
85+
8186
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
8287

8388
include::modules/installation-ibm-z-user-infra-machines-iso.adoc[leveloffset=+1]

modules/installation-configuration-parameters.adoc

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
2929
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
3030
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
31+
// * installing/installing_ibm_z/installing-ibm-z.adoc
32+
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
33+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
34+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
3135

3236
ifeval::["{context}" == "installing-aws-customizations"]
3337
:aws:
@@ -141,18 +145,30 @@ endif::[]
141145
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
142146
:vsphere:
143147
endif::[]
148+
ifeval::["{context}" == "installing-ibm-z"]
149+
:ibm-z:
150+
endif::[]
151+
ifeval::["{context}" == "installing-ibm-z-kvm"]
152+
:ibm-z:
153+
endif::[]
154+
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
155+
:ibm-z:
156+
endif::[]
157+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
158+
:ibm-z:
159+
endif::[]
144160

145161
[id="installation-configuration-parameters_{context}"]
146162
= Installation configuration parameters
147163

148164
// If install-config.yaml is generated by openshift-install
149-
ifndef::bare[]
165+
ifndef::bare,ibm-z[]
150166
Before you deploy an {product-title} cluster, you provide parameter values to describe your account on the cloud platform that hosts your cluster and optionally customize your cluster's platform. When you create the `install-config.yaml` installation configuration file, you provide values for the required parameters through the command line. If you customize your cluster, you can modify the `install-config.yaml` file to provide more details about the platform.
151-
endif::bare[]
167+
endif::bare,ibm-z[]
152168
// If the user manually creates install-config.yaml
153-
ifdef::bare[]
169+
ifdef::bare,ibm-z[]
154170
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
155-
endif::bare[]
171+
endif::bare,ibm-z[]
156172

157173
[NOTE]
158174
====
@@ -194,7 +210,7 @@ The string must be 14 characters or fewer long.
194210
endif::osp[]
195211

196212
|`platform`
197-
|The configuration for the specific platform upon which to perform the installation: `aws`, `baremetal`, `azure`, `openstack`, `ovirt`, `vsphere`. For additional information about `platform.<platform>` parameters, consult the table for your specific platform that follows.
213+
|The configuration for the specific platform upon which to perform the installation: `aws`, `baremetal`, `azure`, `openstack`, `ovirt`, `vsphere`, or `{}`. For additional information about `platform.<platform>` parameters, consult the table for your specific platform that follows.
198214
|Object
199215

200216
ifndef::openshift-origin[]
@@ -410,9 +426,17 @@ Optional installation configuration parameters are described in the following ta
410426
|The configuration for the machines that comprise the compute nodes.
411427
|Array of `MachinePool` objects. For details, see the following "Machine-pool" table.
412428

429+
ifndef::ibm-z[]
413430
|`compute.architecture`
414431
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `amd64` (the default).
415432
|String
433+
endif::ibm-z[]
434+
435+
ifdef::ibm-z[]
436+
|`compute.architecture`
437+
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `s390x` (the default).
438+
|String
439+
endif::ibm-z[]
416440

417441
|`compute.hyperthreading`
418442
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on compute machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
@@ -439,9 +463,17 @@ accounts for the dramatically decreased machine performance.
439463
|The configuration for the machines that comprise the control plane.
440464
|Array of `MachinePool` objects. For details, see the following "Machine-pool" table.
441465

466+
ifndef::ibm-z[]
442467
|`controlPlane.architecture`
443468
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `amd64` (the default).
444469
|String
470+
endif::ibm-z[]
471+
472+
ifdef::ibm-z[]
473+
|`controlPlane.architecture`
474+
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `s390x` (the default).
475+
|String
476+
endif::ibm-z[]
445477

446478
|`controlPlane.hyperthreading`
447479
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on control plane machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
@@ -1263,3 +1295,15 @@ endif::[]
12631295
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
12641296
:!vsphere:
12651297
endif::[]
1298+
ifeval::["{context}" == "installing-ibm-z"]
1299+
:!ibm-z:
1300+
endif::[]
1301+
ifeval::["{context}" == "installing-ibm-z-kvm"]
1302+
:!ibm-z:
1303+
endif::[]
1304+
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
1305+
:!ibm-z:
1306+
endif::[]
1307+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
1308+
:!ibm-z:
1309+
endif::[]

modules/nw-operator-cr.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
1111
// * installing/installing_gcp/installing-gcp-network-customizations.adoc
1212
// * post_installation_configuration/network-configuration.adoc
13+
// * installing/installing_ibm_z/installing-ibm-z.adoc
14+
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
15+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
16+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
1317

1418
// Installation assemblies need different details than the CNO operator does
1519
ifeval::["{context}" == "cluster-network-operator"]

0 commit comments

Comments
 (0)