Skip to content

Commit

Permalink
removed all conditionals
Browse files Browse the repository at this point in the history
  • Loading branch information
SNiemann15 committed Apr 7, 2023
1 parent 480b691 commit c5a1c0c
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 70 deletions.
6 changes: 0 additions & 6 deletions installing/installing_ibm_z/installing-ibm-z-kvm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,6 @@ include::modules/installation-user-infra-machines-static-network.adoc[leveloffse

include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2]

[role="_additional-resources"]
[id="additional-resources_configure-nbde-ibm-z-kvm"]
.Additional resources

* xref:../../installing/install_config/installing-customizing.adoc#installing-customizing[Creating machine configs with Butane].

include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]

include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
Expand Down
6 changes: 0 additions & 6 deletions installing/installing_ibm_z/installing-ibm-z.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ include::modules/installation-user-infra-machines-static-network.adoc[leveloffse

include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2]

[role="_additional-resources"]
[id="additional-resources_configure-nbde-ibm-z"]
.Additional resources

* xref:../../installing/install_config/installing-customizing.adoc#installing-customizing[Creating machine configs with Butane].

include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]

include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ include::modules/installation-user-infra-machines-static-network.adoc[leveloffse

include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2]

[role="_additional-resources"]
[id="additional-resources_configure-nbde-ibm-z-kvm-restricted"]
.Additional resources

* xref:../../installing/install_config/installing-customizing.adoc#installing-customizing[Creating machine configs with Butane].

include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]

include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ include::modules/installation-user-infra-machines-static-network.adoc[leveloffse

include::modules/ibmz-configure-nbde-with-static-ip.adoc[leveloffset=+2]

[role="_additional-resources"]
[id="additional-resources_Configure-nbde-ibm-z-restricted"]
.Additional resources

* xref:../../installing/install_config/installing-customizing.adoc#installing-customizing[Creating machine configs with Butane].

include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]

include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
Expand Down
47 changes: 1 addition & 46 deletions modules/ibmz-configure-nbde-with-static-ip.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc

ifeval::["{context}" == "installing-ibm-z"]
:ibm-z:
endif::[]
ifeval::["{context}" == "installing-ibm-z-kvm"]
:ibm-z-kvm:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
:ibm-z:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
:ibm-z-kvm:
endif::[]

:_content-type: PROCEDURE
[id="configuring-nbde-static-ip-ibmz-linuxone-environment_{context}"]
= Configuring NBDE with static IP in an {ibmzProductName} or {linuxoneProductName} environment
Expand Down Expand Up @@ -53,13 +40,11 @@ boot_device:
openshift:
fips: true
----
ifndef::ibm-z-kvm[]
+
[NOTE]
====
To encrypt DASD disks you must add `device: /dev/disk/by-label/root` to the Ignition file that is generated by Butane.
====
endif::ibm-z-kvm[]

. Create a customized initramfs file, by running the following command:
+
Expand All @@ -73,19 +58,16 @@ $ coreos-installer pxe customize \
--dest-karg-append rd.neednet=1 -o \
/root/rhcos-bootfiles/<Node-name>-initramfs.s390x.img
----
ifndef::ibm-z-kvm[]
+
[NOTE]
====
Before first boot, you must customize the initramfs for each node in the cluster and add PXE kernel parameters.
====
endif::ibm-z-kvm[]

. Create a parameter file that includes `ignition.platform.id=metal` and `ignition.firstboot`.
+
Example kernel parameter file for the control plane machine:
+
ifndef::ibm-z-kvm[]
[source,terminal]
----
rd.neednet=1 \
Expand All @@ -104,32 +86,5 @@ rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \
<1> For installations on DASD-type disks, add `coreos.inst.install_dev=dasda`. Omit this value for FCP-type disks.
<2> For installations on FCP-type disks, add `zfcp.allow_lun_scan=0`. Omit this value for DASD-type disks.
<3> For installations on DASD-type disks, replace with `rd.dasd=0.0.3490` to specify the DASD device.
endif::ibm-z-kvm[]
ifdef::ibm-z-kvm[]
[source,terminal]
----
rd.neednet=1 \
console=ttysclp0 \
ignition.firstboot=true ignition.platform.id=metal \
coreos.live.rootfs_url=http://10.19.17.25/redhat/ocp/rhcos-413.86.202302201445-0/rhcos-413.86.202302201445-0-live-rootfs.s390x.img \ coreos.inst.ignition_url=http://bastion.ocp-cluster1.example.com:8080/ignition/master.ign \
ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
zfcp.allow_lun_scan=0 \
rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \
----
endif::ibm-z-kvm[]
+
Write all options in the parameter file as a single line and make sure you have no newline characters.

ifeval::["{context}" == "installing-ibm-z"]
:!ibm-z:
endif::[]
ifeval::["{context}" == "installing-ibm-z-kvm"]
:!ibm-z-kvm:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
:!ibm-z:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
:!ibm-z-kvm:
endif::[]
Write all options in the parameter file as a single line and make sure you have no newline characters.

0 comments on commit c5a1c0c

Please sign in to comment.