Skip to content

Update master for 3.14 branching #3682

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

Merged
merged 2 commits into from
Feb 20, 2025

Conversation

ColeHiggins2
Copy link
Contributor

@ColeHiggins2 ColeHiggins2 commented Feb 18, 2025

  • 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 (EL9 only)
  • Foreman 3.12/Katello 4.14 (Satellite 6.16)
  • Foreman 3.11/Katello 4.13 (orcharhino 6.11 on EL8 only; orcharhino 7.0 on EL8+EL9)
  • 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.

@ColeHiggins2 ColeHiggins2 requested a review from ekohl February 18, 2025 22:00
@ColeHiggins2 ColeHiggins2 self-assigned this Feb 18, 2025
@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 Feb 18, 2025
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

A lot of guides aren't ready for stable branches so we should hide the links to them.

Comment on lines 17 to 24
{
"title": "Installing Foreman server",
"path": "Installing_Server"
},
{
"title": "Installing Smart Proxy",
"path": "Installing_Proxy"
},
Copy link
Member

Choose a reason for hiding this comment

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

These aren't considered ready and hidden

Suggested change
{
"title": "Installing Foreman server",
"path": "Installing_Server"
},
{
"title": "Installing Smart Proxy",
"path": "Installing_Proxy"
},

Comment on lines 33 to 44
{
"title": "Deploying Foreman on AWS",
"path": "Deploying_Project_on_AWS"
},
{
"title": "Provisioning hosts",
"path": "Provisioning_Hosts"
},
{
"title": "Managing hosts",
"path": "Managing_Hosts"
},
Copy link
Member

Choose a reason for hiding this comment

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

Same here

Suggested change
{
"title": "Deploying Foreman on AWS",
"path": "Deploying_Project_on_AWS"
},
{
"title": "Provisioning hosts",
"path": "Provisioning_Hosts"
},
{
"title": "Managing hosts",
"path": "Managing_Hosts"
},

Comment on lines 49 to 60
{
"title": "Configuring hosts by using Puppet",
"path": "Managing_Configurations_Puppet"
},
{
"title": "Configuring hosts by using Salt",
"path": "Managing_Configurations_Salt"
},
{
"title": "Managing security compliance",
"path": "Managing_Security_Compliance"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Configuring hosts by using Puppet",
"path": "Managing_Configurations_Puppet"
},
{
"title": "Configuring hosts by using Salt",
"path": "Managing_Configurations_Salt"
},
{
"title": "Managing security compliance",
"path": "Managing_Security_Compliance"
},

Comment on lines 69 to 76
{
"title": "Using Foreman API",
"path": "Project_API"
},
{
"title": "Application centric deployment",
"path": "Deploying_Hosts_AppCentric"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Using Foreman API",
"path": "Project_API"
},
{
"title": "Application centric deployment",
"path": "Deploying_Hosts_AppCentric"
},

Comment on lines 95 to 98
{
"title": "Installing Foreman server",
"path": "Installing_Server"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Installing Foreman server",
"path": "Installing_Server"
},

Comment on lines 107 to 114
{
"title": "Deploying Foreman on AWS",
"path": "Deploying_Project_on_AWS"
},
{
"title": "Provisioning hosts",
"path": "Provisioning_Hosts"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Deploying Foreman on AWS",
"path": "Deploying_Project_on_AWS"
},
{
"title": "Provisioning hosts",
"path": "Provisioning_Hosts"
},

Comment on lines 119 to 122
{
"title": "Configuring hosts by using Puppet",
"path": "Managing_Configurations_Puppet"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Configuring hosts by using Puppet",
"path": "Managing_Configurations_Puppet"
},

Comment on lines 131 to 134
{
"title": "Using Foreman API",
"path": "Project_API"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{
"title": "Using Foreman API",
"path": "Project_API"
},

Comment on lines 16 to 17
* link:/{FOREMAN_VER}/Installing_Server/index-foreman-el.html[Installing Foreman on Enterprise Linux]
* link:/{FOREMAN_VER}/Installing_Server/index-foreman-deb.html[Installing Foreman on Debian/Ubuntu]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* link:/{FOREMAN_VER}/Installing_Server/index-foreman-el.html[Installing Foreman on Enterprise Linux]
* link:/{FOREMAN_VER}/Installing_Server/index-foreman-deb.html[Installing Foreman on Debian/Ubuntu]

Comment on lines 19 to 21

* link:/{FOREMAN_VER}/Installing_Proxy/index-foreman-el.html[Installing Smart Proxy on Enterprise Linux]
* link:/{FOREMAN_VER}/Installing_Proxy/index-foreman-deb.html[Installing Smart Proxy on Debian/Ubuntu]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* link:/{FOREMAN_VER}/Installing_Proxy/index-foreman-el.html[Installing Smart Proxy on Enterprise Linux]
* link:/{FOREMAN_VER}/Installing_Proxy/index-foreman-deb.html[Installing Smart Proxy on Debian/Ubuntu]

@pr-processor pr-processor bot added Waiting on contributor Requires an action from the author and removed Not yet reviewed labels Feb 20, 2025
@pr-processor pr-processor bot added Needs re-review and removed Waiting on contributor Requires an action from the author labels Feb 20, 2025
@ColeHiggins2 ColeHiggins2 requested a review from ekohl February 20, 2025 17:25
@ekohl ekohl merged commit cf0c815 into theforeman:master Feb 20, 2025
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs style review Requires a review from docs style/grammar perspective Needs tech review Requires a review from the technical perspective Needs testing Requires functional testing
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants