Skip to content

Initial commit for IPI bare metal installation for OCP 4.6#25812

Merged
ahardin-rh merged 1 commit intoopenshift:masterfrom
johnwilkins:ipi-baremetal-install-4.6-sprint1
Oct 1, 2020
Merged

Initial commit for IPI bare metal installation for OCP 4.6#25812
ahardin-rh merged 1 commit intoopenshift:masterfrom
johnwilkins:ipi-baremetal-install-4.6-sprint1

Conversation

@johnwilkins
Copy link
Contributor

@ahardin-rh This is for the 4.6 release. I have not modified the topic map file yet.
@rlopez133 New topics for 4.6 to port back to upstream.
@iranzo See above.

Signed-off-by: John Wilkins jowilkin@redhat.com

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 25, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@iranzo
Copy link
Member

iranzo commented Sep 28, 2020

@johnwilkins I was checking and the PR seems to miss some of the things we recently covered in upstream:
image

image

As well as lot of the conditionals we used to have the same source for several releases of the docs, I'm still reviewing how does applying this hilights as changes with upstream, thanks for the pointer

@ahardin-rh ahardin-rh self-assigned this Sep 28, 2020
@ahardin-rh ahardin-rh added this to the Future Release milestone Sep 28, 2020
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 1, 2020
@johnwilkins johnwilkins force-pushed the ipi-baremetal-install-4.6-sprint1 branch 3 times, most recently from 3bd437e to 0fca139 Compare October 1, 2020 17:51
Copy link
Contributor

Choose a reason for hiding this comment

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

unnecessary line break before out-of-band?

Copy link
Contributor

Choose a reason for hiding this comment

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

[source,yaml]

Copy link
Contributor

Choose a reason for hiding this comment

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

s/OpenShift Container Platform/{product-title}

Copy link
Contributor

Choose a reason for hiding this comment

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

drop master here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Need it there, because it's still named master in the software. I've informed Roger about this.

Copy link
Contributor

Choose a reason for hiding this comment

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

drop master here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ibid, we need to maintain master in certain cases. The config file examples will have it until we get rid of it in the software. So I've made it parenthetical to de-emphasize it.

@ahardin-rh ahardin-rh added the peer-review-done Signifies that the peer review team has reviewed this PR label Oct 1, 2020
@johnwilkins johnwilkins force-pushed the ipi-baremetal-install-4.6-sprint1 branch from c11bf81 to 16dc13e Compare October 1, 2020 20:10
@ahardin-rh ahardin-rh merged commit 108bf9e into openshift:master Oct 1, 2020
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@ahardin-rh: #25812 failed to apply on top of branch "enterprise-4.6":

Applying: Peer review edits.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ipi-install-creating-an-rhcos-images-cache.adoc
M	modules/ipi-install-preparing-the-provision-node-for-openshift-install.adoc
M	modules/ipi-install-retrieving-the-openshift-installer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-retrieving-the-openshift-installer.adoc
CONFLICT (modify/delete): modules/ipi-install-preparing-the-provision-node-for-openshift-install.adoc deleted in Peer review edits. and modified in HEAD. Version HEAD of modules/ipi-install-preparing-the-provision-node-for-openshift-install.adoc left in tree.
Auto-merging modules/ipi-install-creating-an-rhcos-images-cache.adoc
Removing installing/installing_bare_metal_ipi/images/OpenShift_Baremetal_IPI_Deployment_2.png
Removing installing/installing_bare_metal_ipi/images/71_OpenShift_Baremetal_IPI_Depoyment_0320_1.png
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Peer review edits.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[id="ipi-install-configuration-files"]
= Configuration files
:context: ipi-install-configuration-files
:release: 4.6
Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @johnwilkins - what is the use of this attribute here? Unless I am misunderstanding, AsciiBinder provides the current version using the product-version attribute.

Copy link
Member

Choose a reason for hiding this comment

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

@vikram-redhat in baremetal-deploy we use that value to define the version as we do use one set of docs for all releases and we use it in conditionals inside the code to show/hide the relevant sections

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @iranzo - within OpenShift docs, you don't need this attribute. Instead use {product-version} wherever you want to use this and that will return, in the case of these docs, 4.6 and you can use that for conditionals like you would normally.

@johnwilkins johnwilkins deleted the ipi-baremetal-install-4.6-sprint1 branch May 18, 2021 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.6 peer-review-done Signifies that the peer review team has reviewed this PR size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants