Skip to content

Conversation

@emarcusRH
Copy link
Contributor

@emarcusRH emarcusRH commented Jan 12, 2021

…p on RHV in restricted network
Installing a cluster on RHV in a restricted network [enterprise-4.7]

https://issues.redhat.com/browse/OCPRHV-416

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 12, 2021
@netlify
Copy link

netlify bot commented Feb 9, 2021

Deploy preview for osdocs ready!

Built with commit 6cee979

https://deploy-preview-28522--osdocs.netlify.app

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 9, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 10, 2021
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2021
@emarcusRH emarcusRH changed the title WIP: OCPRHV-416 prelim draft for new chapter - Cluster setu… WIP: OCPRHV-416 new chap - Cluster setup on RHV in a restricted network Mar 11, 2021
@emarcusRH emarcusRH changed the title WIP: OCPRHV-416 new chap - Cluster setup on RHV in a restricted network OCPRHV-416 new chap - Cluster setup on RHV in a restricted network Mar 11, 2021
@emarcusRH emarcusRH marked this pull request as ready for review March 11, 2021 15:02
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 11, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 11, 2021
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

Glad to see another IPI restricted network guide go in! I've provided some feedback. I think there are a few merge conflict issues that may have overwritten some existing content. Let me know if you have any questions.

This will need to be verified by QE as well (didn't see any acks on the PR).

Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

Thanks for the followup work. This is getting close. I've provided some additional feedback on the remaining issues. I also pointed out what I believe is causing the build issues.

Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

@emarcusRH This is so close! Just a few last things to wrap up.

Can you also mark the RHV IPI restricted network cell in the support matrix here: https://docs.openshift.com/container-platform/4.7/installing/installing-preparing.html#supported-installation-methods-for-different-platforms?

@codyhoag
Copy link
Contributor

Confirmed with Eli that this has passed QE review.

Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

LGTM!

@codyhoag codyhoag merged commit a9357bf into openshift:master Mar 17, 2021
@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.7

@openshift-cherrypick-robot

@codyhoag: #28522 failed to apply on top of branch "enterprise-4.8":

Applying: OCPRHV-416 updates to return to pre squash state
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/installation-about-restricted-network.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installing-rhv-verifying-rhv-environment.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-rhv-verifying-rhv-environment.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
Auto-merging modules/installation-about-restricted-network.adoc
CONFLICT (content): Merge conflict in modules/installation-about-restricted-network.adoc
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 OCPRHV-416 updates to return to pre squash state
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.8

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.

@openshift-cherrypick-robot

@codyhoag: #28522 failed to apply on top of branch "enterprise-4.7":

Applying: OCPRHV-416 updates to return to pre squash state
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/installation-about-restricted-network.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installing-rhv-verifying-rhv-environment.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-rhv-verifying-rhv-environment.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
Auto-merging modules/installation-about-restricted-network.adoc
CONFLICT (content): Merge conflict in modules/installation-about-restricted-network.adoc
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 OCPRHV-416 updates to return to pre squash state
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.7

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 branch/enterprise-4.8 size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[enterprise-4.7] Issue in file installing/installing-preparing.adoc

4 participants