Skip to content

Commit 08ab308

Browse files
authored
Merge pull request #73169 from skopacz1/OSDOCS-6634
OSDOCS#6634: specifying agent subdirectory for additional config
2 parents b5ddc78 + 0f0aeb2 commit 08ab308

File tree

4 files changed

+38
-9
lines changed

4 files changed

+38
-9
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ include::modules/installing-ocp-agent-inputs.adoc[leveloffset=+2]
3737

3838
You can create additional manifests to further configure your cluster beyond the configurations available in the `install-config.yaml` and `agent-config.yaml` files.
3939

40+
// Creating a directory to contain additional manifests
41+
include::modules/installing-ocp-agent-manifest-folder.adoc[leveloffset=+3]
42+
43+
[role="_additional-resources"]
44+
.Additional resources
45+
* xref:../../post_installation_configuration/machine-configuration-tasks.adoc#using-machineconfigs-to-change-machines[Using MachineConfig objects to configure nodes]
46+
4047
// Partitioning the disk
4148
include::modules/installation-user-infra-machines-advanced.adoc[leveloffset=+3]
4249

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ include::modules/installing-ocp-agent-inputs.adoc[leveloffset=+1]
2828
* See xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installation-three-node-cluster_installing-restricted-networks-bare-metal[Configuring a three-node cluster] to deploy three-node clusters in bare metal environments.
2929
* xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#root-device-hints_preparing-to-install-with-agent-based-installer[About root device hints].
3030
* link:https://nmstate.io/examples.html[NMState state examples].
31+
* xref:../../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-ocp-agent-opt-manifests_installing-with-agent-based-installer[Optional: Creating additional manifest files]
3132

3233
// Creating the PXE assets
3334
include::modules/pxe-assets-ocp-agent.adoc[leveloffset=+1]

modules/installation-user-infra-machines-advanced.adoc

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ The use of a separate partition for the `/var` directory or a subdirectory of `/
125125

126126
The following procedure sets up a separate `/var` partition by adding a machine config manifest that is wrapped into the Ignition config file for a node type during the preparation phase of an installation.
127127

128+
ifdef::agent[]
129+
.Prerequisites
130+
* You have created an `openshift` subdirectory within your installation directory.
131+
endif::agent[]
132+
128133
.Procedure
129134

130135
ifndef::agent[]
@@ -136,15 +141,6 @@ $ openshift-install create manifests --dir <installation_directory>
136141
----
137142
endif::agent[]
138143

139-
ifdef::agent[]
140-
. On your installation host, create the `openshift` subdirectory within the installation directory:
141-
+
142-
[source,terminal]
143-
----
144-
$ mkdir <installation_directory>/openshift
145-
----
146-
endif::agent[]
147-
148144
. Create a Butane config that configures the additional partition. For example, name the file `$HOME/clusterconfig/98-var-partition.bu`, change the disk device name to the name of the storage device on the `worker` systems, and set the storage size as appropriate. This example places the `/var` directory on a separate partition:
149145
+
150146
[source,yaml,subs="attributes+"]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * installing/installing-with-agent-based-installer/installing-with-agent-based-installer.adoc
4+
5+
:_mod-docs-content-type: PROCEDURE
6+
[id="installing-ocp-agent-manifest-folder_{context}"]
7+
= Creating a directory to contain additional manifests
8+
9+
If you create additional manifests to configure your Agent-based installation beyond the `install-config.yaml` and `agent-config.yaml` files, you must create an `openshift` subdirectory within your installation directory.
10+
All of your additional machine configurations must be located within this subdirectory.
11+
12+
[NOTE]
13+
====
14+
The most common type of additional manifest you can add is a `MachineConfig` object.
15+
For examples of `MachineConfig` objects you can add during the Agent-based installation, see "Using MachineConfig objects to configure nodes" in the "Additional resources" section.
16+
====
17+
18+
.Procedure
19+
20+
* On your installation host, create an `openshift` subdirectory within the installation directory by running the following command:
21+
+
22+
[source,terminal]
23+
----
24+
$ mkdir <installation_directory>/openshift
25+
----

0 commit comments

Comments
 (0)