Power 4.6 Direct install, restricted install and RN#26490
Power 4.6 Direct install, restricted install and RN#26490vikram-redhat merged 1 commit intoopenshift:masterfrom
Conversation
openshift-ci-robot
added
the
size/XL
codyhoag
left a comment
codyhoag
left a comment
There was a problem hiding this comment.
I found only one issue. I will make the change and force push.
|
|
||
| a|Specify multiple network interfaces by specifying multiple `ip=` entries. | ||
|
|
||
| |Specify multiple network interfaces by specifying multiple `ip=` entries. |
There was a problem hiding this comment.
This file contained the only differences I found between the enterprise-4.6 PR and this one. Specifically, this block of changes was missing. These changes should be on lines 10-33 of this file (above what's highlighted here).
There was a problem hiding this comment.
Thanks, @codyhoag. This change confuses me because it rewrites what was there before and I don't know what ifdefs to apply when I add the missing content back.
There was a problem hiding this comment.
Upon further review, I don't actually think ifdefs are necessary. Just a restore to the original content in this file.
openshift-ci-robot
added
size/XXL
openshift-ci-robot
added
size/XL
|
@ktania46 can you review aae3b65a146016e3e4806978eec68c645db2237a (the second commit I made to make this If those edits are not needed, I can revert that commit. That change will also need to be made for 4.6 too, if that's the case, so the content is identical. Let me know 🙂 |
|
|
lgtm/ |
openshift-ci-robot
added
the
needs-rebase
openshift-ci-robot
removed
the
needs-rebase
|
Thanks, @codyhoag, for helping me understand the impact here. OK to merge, @vikram-redhat. I'll then need to re-add what got removed in |
|
@vikram-redhat I squashed my commit that makes this PR identical with the 4.6 branch. This should now be officially ready to merge. I'll let you do the honors 🙂. Bob will follow-up with the changes he summarized in #26490 (comment) to get the content in order. We figured it was better to merge this PR so |
|
Okie dokie - merging! @openshift/team-documentation FYI - only because of possible impacts. If something in the install docs doesn't make sense, blame this PR (and me). ;) But doing this allows future updates to multi-arch docs easier and consistent. |
|
Not to be CPed anywhere else. |
| a|Optional: Bonding multiple network interfaces to a single interface is optionally supported | ||
| using the `bond=` option. In these two examples: |
There was a problem hiding this comment.
Why was this changed? It already prepends the sentence with Optional:.
|
Proposed fix to |
5 participants
@codyhoag now that https://github.com/openshift/openshift-docs/pull/26184/files has merged into the enterprise-4.6 branch, I am adding that into master. There were some conflicts, which I think I have resolved correctly, but please double check and merge if ok. You should be able to push this branch if there are any issues. Sorry I know it's extra work for you, but this one was very tricky, and I want to make sure I got this right so future updates can be done for Power and Z docs directly in master.
@bobfuru I was unsure of the fixes I had to do due to this line that you recently updated: vikram-redhat@195ef0d#diff-812300ac04e88a61895332850e1e5f42004729ad650880e5cdf0b4b57f0490f1R56. These are here in this PR: https://github.com/openshift/openshift-docs/pull/26490/files#diff-812300ac04e88a61895332850e1e5f42004729ad650880e5cdf0b4b57f0490f1R56. Could you please double check it looks ok?
Thanks!
@SNiemann15 and @ktania46 - FYI. Future updates should be done in master.