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

Refs #33337 - Reflect Puppet isn't enabled by default #2690

Merged
merged 2 commits into from
Jan 30, 2024

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Jan 23, 2024

Since Foreman 3.1 Puppet hasn't been enabled in the Katello scenario, but it is in vanilla Foreman. It also rephrases the installer managed parts to avoid the implication that Puppet runs as a deamon.

Please cherry-pick my commits into:

  • Foreman 3.9/Katello 4.11 (planned Satellite 6.15)
  • Foreman 3.8/Katello 4.10
  • Foreman 3.7/Katello 4.9 (Satellite 6.14)
  • Foreman 3.6/Katello 4.8
  • Foreman 3.5/Katello 4.7 (Satellite 6.13; orcharhino 6.6)
  • Foreman 3.4/Katello 4.6 (EL8 only)
  • Foreman 3.3/Katello 4.5 on EL7 & EL8 (Satellite 6.12 on EL8 only; orcharhino 6.4/6.5 on EL8 only)
  • Foreman 3.2/Katello 4.4 on EL7 & EL8
  • Foreman 3.1/Katello 4.3 on EL7 & EL8 (Satellite 6.11 EL7/8; orcharhino 6.3 on EL7/8)
  • We do not accept PRs for Foreman older than 3.1.

Since Foreman 3.1 Puppet hasn't been enabled in the Katello scenario,
but it is in vanilla Foreman.
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.

This is great! Just a tiny detail.

guides/common/modules/proc_configuring-installation.adoc Outdated Show resolved Hide resolved
@pr-processor pr-processor bot added Waiting on contributor Requires an action from the author and removed Not yet reviewed labels Jan 23, 2024
Puppet is an implementation detail. Having it in gives the impression
that Puppet runs as a daemon, but it doesn't.
@pr-processor pr-processor bot added Needs re-review and removed Waiting on contributor Requires an action from the author labels Jan 23, 2024
@ekohl
Copy link
Member Author

ekohl commented Jan 30, 2024

@Lennonka please merge this if you think it's good to go.

@Lennonka Lennonka merged commit 8555aa5 into theforeman:master Jan 30, 2024
8 checks passed
@Lennonka
Copy link
Contributor

Cherry-picked both commits to:

Cherry-picked only the first commit to:

The second commit causes conflicts on 3.7 and older. FYI @ekohl

@ekohl ekohl deleted the no-default-puppet branch January 30, 2024 21:19
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.

None yet

3 participants