Skip to content

Commit e552663

Browse files
authored
Merge pull request #78326 from skopacz1/OSDOCS-11056
OSDOCS#11056: Agent docs cleanup
2 parents ac24242 + ea7190d commit e552663

12 files changed

+51
-45
lines changed

installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88

99
Use the following procedures to install an {product-title} cluster using the Agent-based Installer.
1010

11-
[id="prerequisites_installing-with-agent-based-installer"]
11+
[id="prerequisites_installing-with-agent-based-installer_{context}"]
1212
== Prerequisites
1313

1414
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
@@ -17,15 +17,15 @@ Use the following procedures to install an {product-title} cluster using the Age
1717

1818

1919
// This anchor ID is extracted/replicated from the former installing-ocp-agent.adoc module to preserve links.
20-
[id="installing-ocp-agent_installing-with-agent-based-installer"]
20+
[id="installing-ocp-agent_installing-with-agent-based-installer_{context}"]
2121
== Installing {product-title} with the Agent-based Installer
2222

2323
The following procedures deploy a single-node {product-title} in a disconnected environment. You can use these procedures as a basis and modify according to your requirements.
2424

2525
// Downloading the Agent-based Installer
2626
include::modules/installing-ocp-agent-download.adoc[leveloffset=+2]
2727

28-
//Verifying architectures
28+
// Verifying the supported architecture for an Agent-based installation
2929
include::modules/agent-installer-architectures.adoc[leveloffset=+2]
3030

3131
// Creating the preferred configuration inputs
@@ -38,9 +38,9 @@ include::modules/installing-ocp-agent-inputs.adoc[leveloffset=+2]
3838
* xref:../../installing/installing_with_agent_based_installer/understanding-disconnected-installation-mirroring.adoc#configuring-the-agent-based-installer-to-use-mirrored-images[Configuring the Agent-based Installer to use mirrored images]
3939

4040
[id="installing-ocp-agent-opt-manifests_{context}"]
41-
=== Optional: Creating additional manifest files
41+
=== Creating additional manifest files
4242

43-
You can create additional manifests to further configure your cluster beyond the configurations available in the `install-config.yaml` and `agent-config.yaml` files.
43+
As an optional task, you can create additional manifests to further configure your cluster beyond the configurations available in the `install-config.yaml` and `agent-config.yaml` files.
4444

4545
// Creating a directory to contain additional manifests
4646
include::modules/installing-ocp-agent-manifest-folder.adoc[leveloffset=+3]
@@ -52,7 +52,7 @@ include::modules/installing-ocp-agent-manifest-folder.adoc[leveloffset=+3]
5252
// Partitioning the disk
5353
include::modules/installation-user-infra-machines-advanced.adoc[leveloffset=+3]
5454

55-
// Optional: Using ZTP manifests
55+
// Using ZTP manifests
5656
include::modules/installing-ocp-agent-ZTP.adoc[leveloffset=+2]
5757

5858
[role="_additional-resources"]
@@ -61,7 +61,7 @@ include::modules/installing-ocp-agent-ZTP.adoc[leveloffset=+2]
6161

6262
* See xref:../../edge_computing/ztp-deploying-far-edge-clusters-at-scale.adoc#ztp-deploying-far-edge-clusters-at-scale[Challenges of the network far edge] to learn more about {ztp-first}.
6363

64-
// Optional: Encrypting the disk
64+
// Encrypting the disk
6565
include::modules/installing-ocp-agent-encrypt.adoc[leveloffset=+2]
6666

6767
[role="_additional-resources"]

installing/installing_with_agent_based_installer/prepare-pxe-assets-agent.adoc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ Use the following procedures to create the assets needed to PXE boot an {product
1010

1111
The assets you create in these procedures will deploy a single-node {product-title} installation. You can use these procedures as a basis and modify configurations according to your requirements.
1212

13-
[id="prerequisites_prepare-pxe-assets-agent"]
13+
See xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-with-agent-based-installer[Installing an {product-title} cluster with the Agent-based Installer] to learn about more configurations available with the Agent-based Installer.
14+
15+
[id="prerequisites_prepare-pxe-assets-agent_{context}"]
1416
== Prerequisites
1517

1618
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
@@ -39,10 +41,10 @@ include::modules/installing-ocp-agent-ibm-z.adoc[leveloffset=+1]
3941
// Adding {ibm-z-title} agents with z/VM
4042
include::modules/installing-ocp-agent-ibm-z-zvm.adoc[leveloffset=+2]
4143

44+
[role="_additional-resources"]
45+
.Additional resources
46+
47+
* xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibm-z-title} and {ibm-linuxone-title}]
48+
4249
// Adding {ibm-z-name} agents with {op-system-base} KVM
4350
include::modules/installing-ocp-agent-ibm-z-kvm.adoc[leveloffset=+2]
44-
45-
[role="_additional-resources"]
46-
[id="additional-resources_prepare-pxe-assets-agent"]
47-
== Additional resources
48-
* See xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-with-agent-based-installer[Installing an {product-title} cluster with the Agent-based Installer] to learn about more configurations available with the Agent-based Installer.

modules/agent-installer-architectures.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="agent-install-verifying-architectures_{context}"]
7-
= Verifying the supported architecture for installing an Agent-based Installer cluster
7+
= Verifying the supported architecture for an Agent-based installation
88

99
Before installing an {product-title} cluster using the Agent-based Installer, you can verify the supported architecture on which you can install the cluster. This procedure is optional.
1010

modules/installing-ocp-agent-ZTP.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="installing-ocp-agent-ztp_{context}"]
7-
= Optional: Using ZTP manifests
7+
= Using ZTP manifests
88

9-
You can use {ztp-first} manifests to configure your installation beyond the options available through the `install-config.yaml` and `agent-config.yaml` files.
9+
As an optional task, you can use {ztp-first} manifests to configure your installation beyond the options available through the `install-config.yaml` and `agent-config.yaml` files.
1010

1111
[NOTE]
1212
====
@@ -22,7 +22,7 @@ If you chose to configure the `install-config.yaml` and `agent-config.yaml` file
2222
2323
.Procedure
2424

25-
. Use the following command to generate ZTP cluster manifests:
25+
. Generate ZTP cluster manifests by running the following command:
2626
+
2727
[source,terminal]
2828
----
@@ -36,7 +36,7 @@ If you have created the `install-config.yaml` and `agent-config.yaml` files, tho
3636
Any configurations made to the `install-config.yaml` and `agent-config.yaml` files are imported to the ZTP cluster manifests when you run the `openshift-install agent create cluster-manifests` command.
3737
====
3838

39-
. Navigate to the `cluster-manifests` directory:
39+
. Navigate to the `cluster-manifests` directory by running the following command:
4040
+
4141
[source,terminal]
4242
----
@@ -48,7 +48,7 @@ For sample files, see the "Sample GitOps ZTP custom resources" section.
4848

4949
. Disconnected clusters: If you did not define mirror configuration in the `install-config.yaml` file before generating the ZTP manifests, perform the following steps:
5050

51-
.. Navigate to the `mirror` directory:
51+
.. Navigate to the `mirror` directory by running the following command:
5252
+
5353
[source,terminal]
5454
----

modules/installing-ocp-agent-download.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Use this procedure to download the Agent-based Installer and the CLI needed for
2121

2222
. Click *Download Installer* to download and extract the install program.
2323

24-
. You can either download or copy the pull secret by clicking on *Download pull secret* or *Copy pull secret*.
24+
. Download or copy the pull secret by clicking on *Download pull secret* or *Copy pull secret*.
2525

2626
. Click *Download command-line tools* and place the `openshift-install` binary in a directory that is on your `PATH`.

modules/installing-ocp-agent-encrypt.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="installing-ocp-agent-encrypt_{context}"]
7-
= Optional: Encrypting the disk
7+
= Encrypting the disk
88

9-
Use this procedure to encrypt your disk or partition while installing {product-title} with the Agent-based Installer.
9+
As an optional task, you can use this procedure to encrypt your disk or partition while installing {product-title} with the Agent-based Installer.
1010

1111
.Prerequisites
1212

@@ -16,7 +16,7 @@ Use this procedure to encrypt your disk or partition while installing {product-t
1616
1717
.Procedure
1818

19-
. Use the following command to generate ZTP cluster manifests:
19+
. Generate ZTP cluster manifests by running the following command:
2020
+
2121
[source,terminal]
2222
----
@@ -35,7 +35,7 @@ Any configurations made to the `install-config.yaml` and `agent-config.yaml` fil
3535
If you have already generated ZTP manifests, skip this step.
3636
====
3737

38-
. Navigate to the `cluster-manifests` directory:
38+
. Navigate to the `cluster-manifests` directory by running the following command:
3939
+
4040
[source,terminal]
4141
----
@@ -51,6 +51,6 @@ diskEncryption:
5151
mode: tang <2>
5252
tangServers: "server1": "http://tang-server-1.example.com:7500" <3>
5353
----
54-
<1> Specify which nodes to enable disk encryption on. Valid values are 'none', 'all', 'master', and 'worker'.
55-
<2> Specify which disk encryption mode to use. Valid values are 'tpmv2' and 'tang'.
54+
<1> Specify which nodes to enable disk encryption on. Valid values are `none`, `all`, `master`, and `worker`.
55+
<2> Specify which disk encryption mode to use. Valid values are `tpmv2` and `tang`.
5656
<3> Optional: If you are using Tang, specify the Tang servers.

modules/installing-ocp-agent-gather-log.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Use the following procedure to gather log data about a failed Agent-based instal
1818
+
1919
[source,terminal]
2020
----
21-
$ ./openshift-install --dir <install_directory> agent wait-for bootstrap-complete --log-level=debug
21+
$ ./openshift-install --dir <installation_directory> agent wait-for bootstrap-complete --log-level=debug
2222
----
2323
+
2424
.Example error message
@@ -56,7 +56,7 @@ $ ./openshift-install --dir <install_directory> agent wait-for install-complete
5656
$ export KUBECONFIG=<install_directory>/auth/kubeconfig
5757
----
5858

59-
.. To gather information for debugging, run the following command:
59+
.. Gather information for debugging by running the following command:
6060
+
6161
[source,terminal]
6262
----
@@ -70,6 +70,6 @@ $ oc adm must-gather
7070
$ tar cvaf must-gather.tar.gz <must_gather_directory>
7171
----
7272

73-
. Excluding the `/auth` subdirectory, attach the installation directory used during the deployment to your support case on the link:https://access.redhat.com[Red Hat Customer Portal].
73+
. Excluding the `/auth` subdirectory, attach the installation directory used during the deployment to your support case on the link:https://access.redhat.com[Red{nbsp}Hat Customer Portal].
7474

7575
. Attach all other data gathered from this procedure to your support case.

modules/installing-ocp-agent-ibm-z-kvm.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ endif::[]
1212
= Adding {ibm-z-name} agents with {op-system-base} KVM
1313

1414
Use the following procedure to manually add {ibm-z-name} agents with {op-system-base} KVM.
15+
Only use this procedure for {ibm-z-name} clusters with {op-system-base} KVM.
1516

1617
[NOTE]
1718
====
@@ -62,7 +63,7 @@ $ virt-install
6263
--memory=<memory> \
6364
--cpu host \
6465
--vcpus=<vcpus> \
65-
--cdrom <agent.iso_image> \ <1>
66+
--cdrom <agent_iso_image> \ <1>
6667
--disk pool=default,size=<disk_pool_size> \
6768
--network network:default,mac=<mac_address> \
6869
--graphics none \

modules/installing-ocp-agent-ibm-z-zvm.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
= Adding {ibm-z-title} agents with z/VM
88

99
Use the following procedure to manually add {ibm-z-name} agents with z/VM.
10+
Only use this procedure for {ibm-z-name} clusters with with z/VM.
1011

1112
.Procedure
1213

@@ -39,7 +40,7 @@ Leave all other parameters unchanged.
3940

4041
. Punch the `kernel.img`,`generic.parm`, and `initrd.img` files to the virtual reader of the z/VM guest virtual machine.
4142
+
42-
For more information, see link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-punch[PUNCH] in IBM Documentation.
43+
For more information, see link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-punch[PUNCH] ({ibm-title} Documentation).
4344
+
4445
[TIP]
4546
====
@@ -55,4 +56,4 @@ You can use the `CP PUNCH` command or, if you use Linux, the `vmur` command, to
5556
$ ipl c
5657
----
5758
+
58-
For more information, see link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] in IBM Documentation.
59+
For more information, see link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] ({ibm-title} Documentation).

modules/installing-ocp-agent-ibm-z.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
= Manually adding {ibm-z-title} agents
88

99
After creating the PXE assets, you can add {ibm-z-name} agents.
10+
Only use this procedure for {ibm-z-name} clusters.
1011

1112
Depending on your {ibm-z-name} environment, you can choose from the following options:
1213

0 commit comments

Comments
 (0)