From ddf1348a69f82d297ff87689bdb9c0e31aeda366 Mon Sep 17 00:00:00 2001 From: Areyus Date: Thu, 19 Oct 2023 18:25:50 +0200 Subject: [PATCH] Update Puppet Smart-Proxy compatibility (#2107) Smart-Proxy compatibility changed[1] in Foreman 3.4 to only support Puppet >=6. Version 4.4 - 5.x have partial compatibility, but are listed as unsupported since those are end of life anyway. For the installer it's as follows: | Version | Puppet | commit | |---------|--------|--------| | 3.9 | 7.9.0 | https://github.com/theforeman/foreman-installer/commit/08ee2b88f34ea4751cf8d34887cb9bf14d473c44 | | 3.7 | 7.0.0 | https://github.com/theforeman/foreman-installer/commit/fe392fdf4696bf95e9ffb68626375e25f0982a9e | | 3.4 | 6.23.0 | https://github.com/theforeman/foreman-installer/commit/4f543833adb3cf129bba49a1b6cb24700ec42005 | | 3.1 | 6.1.0 | https://github.com/theforeman/foreman-installer/commit/cbd44c86f658d361c1304d1c0ab8fbb779c82d19 | I also copied #2103 to the docs for 3.8 and nightly, which were missing in the original PR. [1]: https://github.com/theforeman/smart-proxy/commit/6983107b997e66c4fff5b4d447b29dbc6c251d2c Co-authored-by: Sebastian Bublitz --- _includes/manuals/3.4/3.1.3_puppet_versions.md | 14 +------------- _includes/manuals/3.5/3.1.3_puppet_versions.md | 14 +------------- _includes/manuals/3.6/3.1.3_puppet_versions.md | 14 +------------- _includes/manuals/3.7/3.1.3_puppet_versions.md | 10 ++-------- _includes/manuals/3.8/3.1.3_puppet_versions.md | 12 +++--------- _includes/manuals/nightly/3.1.3_puppet_versions.md | 12 +++--------- 6 files changed, 11 insertions(+), 65 deletions(-) diff --git a/_includes/manuals/3.4/3.1.3_puppet_versions.md b/_includes/manuals/3.4/3.1.3_puppet_versions.md index 1affa335b8..0ec9d53c1e 100644 --- a/_includes/manuals/3.4/3.1.3_puppet_versions.md +++ b/_includes/manuals/3.4/3.1.3_puppet_versions.md @@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - - 4.4-4.10 - Not supported - Not supported - Deprecated - - - 5.x - Not supported - Not supported - Deprecated - 6.x - 7.x Supported diff --git a/_includes/manuals/3.5/3.1.3_puppet_versions.md b/_includes/manuals/3.5/3.1.3_puppet_versions.md index 1affa335b8..0ec9d53c1e 100644 --- a/_includes/manuals/3.5/3.1.3_puppet_versions.md +++ b/_includes/manuals/3.5/3.1.3_puppet_versions.md @@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - - 4.4-4.10 - Not supported - Not supported - Deprecated - - - 5.x - Not supported - Not supported - Deprecated - 6.x - 7.x Supported diff --git a/_includes/manuals/3.6/3.1.3_puppet_versions.md b/_includes/manuals/3.6/3.1.3_puppet_versions.md index ed4abcc684..e76559b182 100644 --- a/_includes/manuals/3.6/3.1.3_puppet_versions.md +++ b/_includes/manuals/3.6/3.1.3_puppet_versions.md @@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - - 4.4-4.10 - Not supported - Not supported - Deprecated - - - 5.x - Not supported - Not supported - Deprecated - 6.x Deprecated diff --git a/_includes/manuals/3.7/3.1.3_puppet_versions.md b/_includes/manuals/3.7/3.1.3_puppet_versions.md index bbe71e53a1..2e82ad6231 100644 --- a/_includes/manuals/3.7/3.1.3_puppet_versions.md +++ b/_includes/manuals/3.7/3.1.3_puppet_versions.md @@ -8,19 +8,13 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - 4.4-4.10 - Not supported - Not supported - Deprecated - - - 5.x - 6.x + 6.x Not supported Not supported Deprecated diff --git a/_includes/manuals/3.8/3.1.3_puppet_versions.md b/_includes/manuals/3.8/3.1.3_puppet_versions.md index 1affa335b8..2e82ad6231 100644 --- a/_includes/manuals/3.8/3.1.3_puppet_versions.md +++ b/_includes/manuals/3.8/3.1.3_puppet_versions.md @@ -8,25 +8,19 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - 4.4-4.10 + 6.x Not supported Not supported Deprecated - 5.x - Not supported - Not supported - Deprecated - - - 6.x - 7.x + 7.x Supported Untested Supported diff --git a/_includes/manuals/nightly/3.1.3_puppet_versions.md b/_includes/manuals/nightly/3.1.3_puppet_versions.md index 1affa335b8..2e82ad6231 100644 --- a/_includes/manuals/nightly/3.1.3_puppet_versions.md +++ b/_includes/manuals/nightly/3.1.3_puppet_versions.md @@ -8,25 +8,19 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a Smart Proxy - 0.x-4.3 + 0.x-5.x Not supported Not supported Not supported - 4.4-4.10 + 6.x Not supported Not supported Deprecated - 5.x - Not supported - Not supported - Deprecated - - - 6.x - 7.x + 7.x Supported Untested Supported