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

Rework planning for foreman #3634

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

Conversation

maximiliankolb
Copy link
Contributor

@maximiliankolb maximiliankolb commented Jan 31, 2025

What changes are you introducing?

  • Rework "Planning for Foreman" guide to make it fit for all flavours
  • Add images for upstream

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

  • Show it upstream for all flavours
  • Make content fit for downstream orcharhino

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

  • Requires Remove unnecessary macros #3632
  • Requires Add docs for Oracle ULN content #3639
  • Style-wise, I will try to apply all your feedback.
  • The guide is big: I might create issues for existing technical inaccuracies rather than fixing/retesting everything myself.
  • Created images for upstream for all but two graphics that contain too much information IMHO:
    • guides/common/images/topology-direct-satellite.png
    • guides/common/images/topology-isolated-satellite.png
  • I have split two files that had different headings to snippets and small concept files with correct headings and anchors (diff on GitHub might look weird):
    • guides/common/modules/con_creating-and-managing-roles.adoc -> guides/common/modules/snip_creating-and-managing-roles.adoc which is now included in two con_ files
    • guides/common/modules/ref_overview-of-authentication-methods-in-project.adoc -> guides/common/modules/snip_table-authentication-methods.adoc which is also included in two con_ files

TODO

Checklists

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

no cherry-picks

@github-actions github-actions bot added Needs tech review Requires a review from the technical perspective Needs style review Requires a review from docs style/grammar perspective Needs testing Requires functional testing labels Jan 31, 2025
Copy link

github-actions bot commented Jan 31, 2025

The PR preview for 84df163 is available at theforeman-foreman-documentation-preview-pr-3634.surge.sh

The following output files are affected by this PR:

show diff

show diff as HTML

@maximiliankolb maximiliankolb force-pushed the rework_planning_for_foreman branch 5 times, most recently from f331cd7 to 4492d57 Compare February 6, 2025 08:15
@maximiliankolb maximiliankolb marked this pull request as ready for review February 6, 2025 08:23
@aneta-petrova aneta-petrova self-requested a review February 6, 2025 11:45
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.

That's a hell of work, Max!
Some initial thoughts below.

The graphics could use a bit of designer's touch, but I can tackle that later in a follow-up PR.

Copy link
Member

@aneta-petrova aneta-petrova left a comment

Choose a reason for hiding this comment

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

This is fantastic, Maximilian! Just nitpicks from me. I'm not officially approving yet to acknowledge that Lena has found a couple of things that would be good to fix.

Comment on lines 43 to 45
* For more information about basic workflows, see {ContentManagementDocURL}Basic_Content_Management_Workflow_content-management[Basic content management workflow].
* For more information about Deb content, see {ContentManagementDocURL}Adding_Custom_Deb_Repositories_content-management[Adding Deb repositories] in _{ContentManagementDocTitle}_.
* For more information about Yum content, see {ContentManagementDocURL}Adding_Custom_RPM_Repositories_content-management[Adding RPM repositories] in _{ContentManagementDocTitle}_.
Copy link
Member

Choose a reason for hiding this comment

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

I prefer the original (shorter) list of references because I don't think that a link whose label says "Basic workflow" needs to be introduced with the words "basic workflows" :) And it's similar for the other links. But that's just FYI to explain why I wrote the original list of references the way it was before. This is your PR and your call, obviously :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have removed "basic workflow" from the description.

Lifecycle environment based structure::
In this hierarchy, the first host group level is reserved for parameters specific to a lifecycle environment.
The second level contains operating system related definitions, and the third level contains application specific settings.
Such structure is useful in scenarios where responsibilities are divided among lifecycle environments (for example, a dedicated owner for the *Development*, *QA*, and *Production* lifecycle stages).
Such structure is useful in scenarios where responsibilities are divided among lifecycle environments, for example, a dedicated owner for the *Development*, *QA*, and *Production* lifecycle stages.
Copy link
Member

Choose a reason for hiding this comment

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

Is it just me or does this also look strange without the parentheses? Written this way, it looks like you're listing examples of lifecycle environments (nonsense, I know, but that's what it looks like when I read it as one sentence without the extra parenthesis separator). Would it make sense to split this into two sentences as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reworded. What do you think now?

Copy link
Contributor Author

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

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

Rebased to "master" and applied all suggestions to texts by Anet and Lena. Will fix the images later. Docs are ready for re-review.

Comment on lines 43 to 45
* For more information about basic workflows, see {ContentManagementDocURL}Basic_Content_Management_Workflow_content-management[Basic content management workflow].
* For more information about Deb content, see {ContentManagementDocURL}Adding_Custom_Deb_Repositories_content-management[Adding Deb repositories] in _{ContentManagementDocTitle}_.
* For more information about Yum content, see {ContentManagementDocURL}Adding_Custom_RPM_Repositories_content-management[Adding RPM repositories] in _{ContentManagementDocTitle}_.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have removed "basic workflow" from the description.

Lifecycle environment based structure::
In this hierarchy, the first host group level is reserved for parameters specific to a lifecycle environment.
The second level contains operating system related definitions, and the third level contains application specific settings.
Such structure is useful in scenarios where responsibilities are divided among lifecycle environments (for example, a dedicated owner for the *Development*, *QA*, and *Production* lifecycle stages).
Such structure is useful in scenarios where responsibilities are divided among lifecycle environments, for example, a dedicated owner for the *Development*, *QA*, and *Production* lifecycle stages.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reworded. What do you think now?

Copy link
Member

@aneta-petrova aneta-petrova left a comment

Choose a reason for hiding this comment

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

Ack, and the foreman-el issue spotted by Lena also looks fixed now.

@aneta-petrova aneta-petrova added style review done No issues from docs style/grammar perspective and removed Needs style review Requires a review from docs style/grammar perspective Needs testing Requires functional testing labels Feb 17, 2025
@maximiliankolb maximiliankolb force-pushed the rework_planning_for_foreman branch from 5d9886a to 15ad8c0 Compare February 17, 2025 15:03
Copy link
Contributor Author

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

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

Rebased to HEAD of "master" and applied all suggestions by Anet and Lena. Graphics are now exported with "appearance: light" which should make a bit nicer.

* Add images for upstream
  $ git diff master| rg "image::" | rg -v "^@@" | rg -v -- "^-" | cut -c 2- | sed "s@image::common/@guides/common/images/@g" | sed "s/\[.*$//g"
* Add xref for ULN content
* Hide content for foreman-el+deb
* Make images not executable
  $ chmod -x guides/common/images/*
* Render Planning for Foreman for all flavours
  $ cat guides/doc-Planning_for_Project/master.adoc | rg "^include" | sed "s/include::/guides\//g" | sed "s/\[.*$//g" | rg "assembly_"
* Reword "on the other hand" to make Vale happy
* Reword concepts included in Planning guide
  $ cat guides/doc-Planning_for_Project/master.adoc | rg "^include" | sed "s/include::/guides\//g" | sed "s/\[.*$//g" | rg "modules/"
* Split file
* Use assembly to bundle provisioning requirements
* Verify content in Planning guide for all flavours
  $ cat guides/doc-Planning_for_Project/master.adoc | rg "^include" | sed "s/include::/guides\//g" | sed "s/\[.*$//g" | rg "assembly_" | xargs -I {} cat "{}" | rg "^include" | sed "s/include::/guides\/common\//g" | sed "s/\[.*$//g"
Export from draw.io with the following options:

* zoom 100%
* transparent no
* appearance light
* embed yes (2x)
This helps a lot:
* You know where is original source is due to the file name of the
  graphics
* When working on the original source file, you can easily export as SVG
  and just download to your local machine; then copy the graphic without
  renaming it.
@maximiliankolb maximiliankolb force-pushed the rework_planning_for_foreman branch from 7301ff2 to 84df163 Compare February 24, 2025 13:23
@maximiliankolb
Copy link
Contributor Author

Rebased to HEAD of "master".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs tech review Requires a review from the technical perspective style review done No issues from docs style/grammar perspective
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants