Skip to content
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.

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

Use same manifest for upstr and downstr servers; add relevant links #3505

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

rh-max
Copy link
Contributor

@rh-max rh-max commented Dec 9, 2024

What changes are you introducing?

Why are you introducing these changes? (Explanation, links to references, issues, etc.)

https://issues.redhat.com/browse/SAT-28286

Anything else to add? (Considerations, potential downsides, alternative solutions you have explored, etc.)

Checklists

  • I am okay with my commits getting squashed when you merge this PR.
  • I am familiar with the contributing guidelines.

Please cherry-pick my commits into:

  • Foreman 3.13/Katello 4.15
  • Foreman 3.12/Katello 4.14 (Satellite 6.16)
  • Foreman 3.11/Katello 4.13 (orcharhino 6.11 on EL8 only)
  • Foreman 3.10/Katello 4.12
  • Foreman 3.9/Katello 4.11 (Satellite 6.15; orcharhino 6.8/6.9/6.10)
  • Foreman 3.8/Katello 4.10
  • Foreman 3.7/Katello 4.9 (Satellite 6.14)
  • We do not accept PRs for Foreman older than 3.7.

@rh-max rh-max force-pushed the installing-disconnected-manifest-fixes branch from 871d798 to 4abdfa5 Compare December 9, 2024 08:11
@rh-max
Copy link
Contributor Author

rh-max commented Dec 9, 2024

@maximiliankolb Do you know why the new xrefs fail?

@rh-max
Copy link
Contributor Author

rh-max commented Dec 9, 2024

@Lennonka Could you PTAL? I want to make sure that the set of links I added to the two places is the correct one. Thanks.

Copy link
Contributor

@Lennonka Lennonka left a comment

Choose a reason for hiding this comment

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

Just a few nitpicks

@pr-processor pr-processor bot added the Waiting on contributor Requires an action from the author label Dec 9, 2024
…onize-content-over-a-network.adoc

Co-authored-by: Lena Ansorgová <[email protected]>
@pr-processor pr-processor bot added Needs re-review and removed Waiting on contributor Requires an action from the author Needs re-review labels Dec 9, 2024
…nto-foreman-server.adoc

Co-authored-by: Lena Ansorgová <[email protected]>
Copy link
Contributor

@Lennonka Lennonka left a comment

Choose a reason for hiding this comment

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

A couple more nitpicks and we'll be good to go.

Comment on lines 8 to +10
* You imported the subscription manifest on both the upstream and downstream {ProjectServer}.
Use the same manifest.
For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[].
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* You imported the subscription manifest on both the upstream and downstream {ProjectServer}.
Use the same manifest.
For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[].
* You imported the same subscription manifest on both the upstream and downstream {ProjectServer}.
For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[].

Comment on lines +28 to +29
You will use the same manifest in
xref:configuring-server-to-synchronize-content-over-a-network_{context}[].
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
You will use the same manifest in
xref:configuring-server-to-synchronize-content-over-a-network_{context}[].
You will use the same manifest in xref:configuring-server-to-synchronize-content-over-a-network_{context}[].

ifndef::orcharhino[]
For more information, see {RHDocsBaseURL}subscription_central/1-latest/html/getting_started_with_rhel_system_registration/adv-reg-rhel-using-rhsm_#using_manifests_con[Using manifests for a disconnected Satellite Server] in _Subscription Central_.
For more information, see {RHDocsBaseURL}subscription_central/1-latest/html-single/creating_and_managing_manifests_for_a_disconnected_satellite_server/index[Creating and managing manifests for a disconnected {ProjectServer}] in _Subscription Central_.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
For more information, see {RHDocsBaseURL}subscription_central/1-latest/html-single/creating_and_managing_manifests_for_a_disconnected_satellite_server/index[Creating and managing manifests for a disconnected {ProjectServer}] in _Subscription Central_.
For more information, see {RHDocsBaseURL}subscription_central/1-latest/html-single/creating_and_managing_manifests_for_a_disconnected_satellite_server/index[Creating and managing manifests for a disconnected Satellite Server] in _Subscription Central_.

For Foreman documentation, we would normally use the attribute. But in this case, the title of the referenced docs shouldn't change with the build, so let's hard code it.
The same below.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants