Skip to content

Update installing-ocp-agent-inputs.adoc #66032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Update installing-ocp-agent-inputs.adoc #66032

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89c9c06
Update installing-ocp-agent-inputs.adoc
Ultimate-etamitlU Oct 10, 2023
4516cd7
Merge branch 'main' into patch-4
Ultimate-etamitlU Oct 12, 2023
9e52992
Update installing-ocp-agent-inputs.adoc
Ultimate-etamitlU Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions modules/installing-ocp-agent-inputs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ networking:
platform:
none: {}
pullSecret: '<pull_secret>' <4>
sshKey: |
'<ssh_pub_key>' <5>
sshKey: '<ssh_pub_key>' <5>
EOF
----
+
Expand Down Expand Up @@ -170,24 +169,3 @@ You must provide the rendezvous IP address when you do not specify at least one
<3> Optional: Overrides the hostname obtained from either the Dynamic Host Configuration Protocol (DHCP) or a reverse DNS lookup. Each host must have a unique hostname supplied by one of these methods.
<4> Enables provisioning of the Red Hat Enterprise Linux CoreOS (RHCOS) image to a particular device. It examines the devices in the order it discovers them, and compares the discovered values with the hint values. It uses the first discovered device that matches the hint value.
<5> Optional: Configures the network interface of a host in NMState format.

ifdef::pxe-boot[]

. Optional: To create an iPXE script, add the `bootArtifactsBaseURL` to the `agent-config.yaml` file:
+
[source,yaml]
----
apiVersion: v1beta1
kind: AgentConfig
metadata:
name: sno-cluster
rendezvousIP: 192.168.111.80
bootArtifactsBaseURL: <asset_server_URL>
----
+
Where `<asset_server_URL>` is the URL of the server you will upload the PXE assets to.
endif::pxe-boot[]

ifeval::["{context}" == "prepare-pxe-assets-agent"]
:!pxe-boot:
endif::[]
Copy link
Contributor

@skopacz1 skopacz1 Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is content that I merged earlier, which triggered the conflict, but this should be included in the main branch of the docs. Can you add this content back in, and then squash all of your commits into one?