Merge pull request #72446 from SNiemann15/ocpbugs30079

[OCPBUGS3-0079] Change url and variables from {} to <>

Author: bscott-rh

modules/install-sno-ibm-z-kvm.adoc

@@ -33,7 +33,7 @@ $ ARCH=<architecture> <1>
 +
 [source,terminal]
 ----
-$ curl -k https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OCP_VERSION/openshift-client-linux.tar.gz -o oc.tar.gz
+$ curl -k https://mirror.openshift.com/pub/openshift-v4/${ARCH}/clients/ocp/${OCP_VERSION}/openshift-client-linux.tar.gz -o oc.tar.gz
 ----
 +
 [source,terminal]
@@ -50,7 +50,7 @@ $ chmod +x oc
 +
 [source,terminal]
 ----
-$ curl -k https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OCP_VERSION/openshift-install-linux.tar.gz -o openshift-install-linux.tar.gz
+$ curl -k https://mirror.openshift.com/pub/openshift-v4/${ARCH}/clients/ocp/${OCP_VERSION}/openshift-install-linux.tar.gz -o openshift-install-linux.tar.gz
 ----
 +
 [source,terminal]
@@ -149,23 +149,23 @@ The file names contain the {product-title} version number. They resemble the fol
 [source,terminal]
 ----
 $ virt-install \
-   --name {vn_name} \
+   --name <vm_name> \
    --autostart \
-   --memory={memory_mb} \
+   --memory=<memory_mb> \
    --cpu host \
-   --vcpus {vcpus} \
-   --location {media_location},kernel={rhcos_kernel},initrd={rhcos_initrd} \// <1>
+   --vcpus <vcpus> \
+   --location <media_location>,kernel=<rhcos_kernel>,initrd=<rhcos_initrd> \// <1>
    --disk size=100 \
-   --network network={virt_network_parm} \
+   --network network=<virt_network_parm> \
    --graphics none \
    --noautoconsole \
-   --extra-args "ip=${IP}::${GATEWAY}:${MASK}:${VM_NAME}::none" \
-   --extra-args "nameserver=${NAME_SERVER}" \
+   --extra-args "ip=<ip>::<gateway>:<mask>:<hostname>::none" \
+   --extra-args "nameserver=<name_server>" \
    --extra-args "ip=dhcp rd.neednet=1 ignition.platform.id=metal ignition.firstboot" \
-   --extra-args "coreos.live.rootfs_url={rhcos_liveos}" \// <2>
-   --extra-args "ignition.config.url={rhcos_ign}" \// <3>
+   --extra-args "coreos.live.rootfs_url=<rhcos_liveos>" \// <2>
+   --extra-args "ignition.config.url=<rhcos_ign>" \// <3>
    --extra-args "random.trust_cpu=on rd.luks.options=discard" \
-   --extra-args "console=tty1 console=ttyS1,115200n8" \
+   --extra-args "console=ttysclp0" \
    --wait
 ----
 <1> For the `--location` parameter, specify the location  of the kernel/initrd on the HTTP or HTTPS server.

modules/install-sno-ibm-z.adoc

@@ -33,7 +33,7 @@ $ ARCH=<architecture> <1>
 +
 [source,terminal]
 ----
-$ curl -k https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OCP_VERSION/openshift-client-linux.tar.gz -o oc.tar.gz
+$ curl -k https://mirror.openshift.com/pub/openshift-v4/${ARCH}/clients/ocp/${OCP_VERSION}/openshift-client-linux.tar.gz -o oc.tar.gz
 ----
 +
 [source,terminal]
@@ -50,7 +50,7 @@ $ chmod +x oc
 +
 [source,terminal]
 ----
-$ curl -k https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OCP_VERSION/openshift-install-linux.tar.gz -o openshift-install-linux.tar.gz
+$ curl -k https://mirror.openshift.com/pub/openshift-v4/${ARCH}/clients/ocp/${OCP_VERSION}/openshift-install-linux.tar.gz -o openshift-install-linux.tar.gz
 ----
 +
 [source,terminal]
@@ -152,16 +152,15 @@ The `rootfs` image is the same for FCP and DASD.
 ----
 rd.neednet=1 \
 console=ttysclp0 \
-coreos.live.rootfs_url={rhcos_liveos}:8080/rootfs.img \// <1>
-ignition.config.url={rhcos_ign}:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <2>
+coreos.live.rootfs_url=<rhcos_liveos>:8080/rootfs.img \// <1>
+ignition.firstboot ignition.platform.id=metal \
+ignition.config.url=<rhcos_ign>:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <2>
 ip=encbdd0:dhcp::02:00:00:02:34:02 <3>
 rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
 rd.dasd=0.0.4411 \// <4>
 rd.zfcp=0.0.8001,0x50050763040051e3,0x4000406300000000 \// <5>
 zfcp.allow_lun_scan=0 \
-rd.luks.options=discard \
-ignition.firstboot ignition.platform.id=metal \
-console=tty1 console=ttyS1,115200n8
+rd.luks.options=discard
 ----
 <1> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
 <2> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.