BZ1846542: add NTP config info to restricted network install content #27809

jeana-redhat · 2020-12-02T20:47:09Z

To address https://bugzilla.redhat.com/show_bug.cgi?id=1846542
Preview for all inclusions (new subsection called NTP configuration near the end of this section):

~~A couple questions:~~
~~1. Does this apply to subsequent and upcoming releases as well?~~
2. This initial commit only encompasses the changes to the page linked from the BZ (which is against the bare metal restricted network content). Am I correct to assume it should be added to all restricted network install content (not just bare metal)?

openshift-docs-preview-bot · 2020-12-02T20:50:00Z

The preview will be available shortly at:

https://BZ1846542--ocpdocs.netlify.com/

jeana-redhat · 2020-12-03T13:40:36Z

@vap0rtranz PTAL

openshift-bot · 2021-03-03T13:41:58Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

jeana-redhat · 2021-03-16T14:01:33Z

/remove-lifecycle stale

jeana-redhat · 2021-03-16T14:03:45Z

@staebler - would you mind taking a look at this and the related doc bug when you have a chance? It was reported for 4.4 (and applied to 4.3 as well), which is no longer getting updates, but if it would still be helpful to add this info to 4.5+ I would like to do so.

staebler

The preview docs are not available, but I think I got everything pieced together in my head. My question is whether this advice should be added to all installations to restricted networks and not just to baremetal installations.

modules/installation-network-user-infra.adoc

jeana-redhat · 2021-03-16T17:03:30Z

@staebler - thanks for looking, and sorry I didn't realize the preview had evaporated! I made your suggested edit and built the preview for reference. The following links are all the places this content appears (sorry I can't link to the exact heading, but it's about two pages down on these under NTP configuration):

Let me know if there are other places missing that you're aware of, and I can rectify that :)

netlify · 2021-03-16T17:12:20Z

Deploy preview for osdocs ready!

Built with commit ad892c9

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

staebler

The following links are all the places this content appears (sorry I can't link to the exact heading, but it's about two pages down on these under NTP configuration):

Ah, thanks. I see in the previews now where new text is being placed. Makes sense.

modules/installation-network-user-infra.adoc

jeana-redhat · 2021-03-16T17:47:20Z

Update: now with additional Additional Resources

staebler · 2021-03-16T18:05:00Z

These changes look good to me.

jeana-redhat · 2021-03-16T18:25:59Z

Ready for QE verification, @gpei PTAL 🙏 (or is this @xltian ?)

gpei · 2021-03-16T23:59:02Z

LGTM, thanks for the update.

jeana-redhat · 2021-03-17T14:10:00Z

@openshift/team-documentation ready for a look

modules/installation-network-user-infra.adoc

bmcelvee · 2021-03-17T14:26:56Z

One tiny suggestion, otherwise LGTM! :)

jeana-redhat · 2021-03-17T14:51:21Z

/cherrypick enterprise-4.8

jeana-redhat · 2021-03-17T14:51:36Z

/cherrypick enterprise-4.7

jeana-redhat · 2021-03-17T14:51:56Z

/cherrypick enterprise-4.6

openshift-cherrypick-robot · 2021-03-17T14:52:02Z

@jeana-redhat: new pull request created: #30582

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.

jeana-redhat · 2021-03-17T14:52:05Z

/cherrypick enterprise-4.5

openshift-cherrypick-robot · 2021-03-17T14:52:16Z

@jeana-redhat: new pull request created: #30584

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.

openshift-cherrypick-robot · 2021-03-17T14:52:41Z

@jeana-redhat: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.8 from head openshift-cherrypick-robot:cherry-pick-27809-to-enterprise-4.8: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-27809-to-enterprise-4.8."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"}

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 · 2021-03-17T14:52:42Z

@jeana-redhat: #27809 failed to apply on top of branch "enterprise-4.5":

Applying: BZ1846542: add NTP config info to restricted network install content
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/installing-bare-metal.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	installing/installing_ibm_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_z/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/installing-ibm-z.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
A	installing/installing_platform_agnostic/installing-platform-agnostic.adoc
M	installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
M	installing/installing_vsphere/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere.adoc
M	modules/installation-network-user-infra.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging installing/installing_vsphere/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
CONFLICT (modify/delete): installing/installing_platform_agnostic/installing-platform-agnostic.adoc deleted in HEAD and modified in BZ1846542: add NTP config info to restricted network install content. Version BZ1846542: add NTP config info to restricted network install content of installing/installing_platform_agnostic/installing-platform-agnostic.adoc left in tree.
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-ibm-z.adoc
CONFLICT (modify/delete): installing/installing_ibm_z/installing-ibm-z-kvm.adoc deleted in HEAD and modified in BZ1846542: add NTP config info to restricted network install content. Version BZ1846542: add NTP config info to restricted network install content of installing/installing_ibm_z/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ1846542: add NTP config info to restricted network install content
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.5

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 · 2021-03-17T14:52:58Z

@jeana-redhat: #27809 failed to apply on top of branch "enterprise-4.6":

Applying: BZ1846542: add NTP config info to restricted network install content
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/installing-bare-metal.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	installing/installing_ibm_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_z/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/installing-ibm-z.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
M	installing/installing_platform_agnostic/installing-platform-agnostic.adoc
M	installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
M	installing/installing_vsphere/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere.adoc
M	modules/installation-network-user-infra.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging installing/installing_vsphere/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
Auto-merging installing/installing_platform_agnostic/installing-platform-agnostic.adoc
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-ibm-z.adoc
CONFLICT (modify/delete): installing/installing_ibm_z/installing-ibm-z-kvm.adoc deleted in HEAD and modified in BZ1846542: add NTP config info to restricted network install content. Version BZ1846542: add NTP config info to restricted network install content of installing/installing_ibm_z/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ1846542: add NTP config info to restricted network install content
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.

jeana-redhat added branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 labels Dec 2, 2020

jeana-redhat added this to the Next Release milestone Dec 2, 2020

openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 2, 2020

openshift-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Mar 3, 2021

openshift-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Mar 16, 2021

staebler reviewed Mar 16, 2021

View reviewed changes

modules/installation-network-user-infra.adoc Outdated Show resolved Hide resolved

jeana-redhat force-pushed the BZ1846542 branch from 5ea60d8 to 0f3db03 Compare March 16, 2021 17:10

staebler reviewed Mar 16, 2021

View reviewed changes

modules/installation-network-user-infra.adoc Outdated Show resolved Hide resolved

jeana-redhat force-pushed the BZ1846542 branch from 0f3db03 to c52cd09 Compare March 16, 2021 17:46

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 16, 2021

jeana-redhat added branch/enterprise-4.8 and removed branch/enterprise-4.4 labels Mar 16, 2021

jeana-redhat force-pushed the BZ1846542 branch from c52cd09 to 6a0e9fe Compare March 17, 2021 14:08

jeana-redhat added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 17, 2021

bmcelvee reviewed Mar 17, 2021

View reviewed changes

modules/installation-network-user-infra.adoc Outdated Show resolved Hide resolved

bmcelvee added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 17, 2021

BZ1846542: add NTP config info to restricted network install content

ad892c9

jeana-redhat force-pushed the BZ1846542 branch from 6a0e9fe to ad892c9 Compare March 17, 2021 14:34

jeana-redhat merged commit c8eb244 into openshift:master Mar 17, 2021

openshift-cherrypick-robot mentioned this pull request Mar 17, 2021

[enterprise-4.8] BZ1846542: add NTP config info to restricted network install content #30582

Merged

openshift-cherrypick-robot mentioned this pull request Mar 17, 2021

[enterprise-4.7] BZ1846542: add NTP config info to restricted network install content #30584

Merged

This was referenced Mar 17, 2021

[enterprise-4.6] BZ1846542: add NTP config info to restricted network install content #30591

Merged

[enterprise-4.5] BZ1846542: add NTP config info to restricted network install content #30596

Merged

jeana-redhat deleted the BZ1846542 branch July 16, 2021 17:34

BZ1846542: add NTP config info to restricted network install content #27809

BZ1846542: add NTP config info to restricted network install content #27809

Uh oh!

Conversation

jeana-redhat commented Dec 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-docs-preview-bot commented Dec 2, 2020

Uh oh!

jeana-redhat commented Dec 3, 2020

Uh oh!

openshift-bot commented Mar 3, 2021

Uh oh!

jeana-redhat commented Mar 16, 2021

Uh oh!

jeana-redhat commented Mar 16, 2021

Uh oh!

staebler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jeana-redhat commented Mar 16, 2021

Uh oh!

netlify bot commented Mar 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

staebler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jeana-redhat commented Mar 16, 2021

Uh oh!

staebler commented Mar 16, 2021

Uh oh!

jeana-redhat commented Mar 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gpei commented Mar 16, 2021

Uh oh!

jeana-redhat commented Mar 17, 2021

Uh oh!

Uh oh!

bmcelvee commented Mar 17, 2021

Uh oh!

jeana-redhat commented Mar 17, 2021

Uh oh!

jeana-redhat commented Mar 17, 2021

Uh oh!

jeana-redhat commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

jeana-redhat commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

jeana-redhat commented Dec 2, 2020 •

edited

Loading

netlify bot commented Mar 16, 2021 •

edited

Loading

jeana-redhat commented Mar 16, 2021 •

edited

Loading