From 8ee29a4cdd0305ad52da786c97577f25664f29c2 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Mon, 27 Mar 2023 14:17:59 -0400
Subject: [PATCH] Fixes #36230: Puppet removal parameter to installer is no
 longer used

---
 definitions/procedures/puppet/remove_puppet.rb           | 3 +--
 test/definitions/procedures/puppet/remove_puppet_test.rb | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/definitions/procedures/puppet/remove_puppet.rb b/definitions/procedures/puppet/remove_puppet.rb
index ad4700401..acf120685 100644
--- a/definitions/procedures/puppet/remove_puppet.rb
+++ b/definitions/procedures/puppet/remove_puppet.rb
@@ -4,7 +4,7 @@ class RemovePuppet < ForemanMaintain::Procedure
       description 'Remove Puppet feature'
       confine do
         feature(:puppet_server) &&
-          (check_min_version('foreman', '3.0') || check_min_version('foreman-proxy', '3.0'))
+          (check_min_version('foreman', '3.6') || check_min_version('foreman-proxy', '3.6'))
       end
       advanced_run false
     end
@@ -42,7 +42,6 @@ def installer_arguments_disabling_puppet
         options << '--foreman-proxy-puppet false'
         options << '--foreman-proxy-puppetca false'
       end
-      options << '--foreman-proxy-content-puppet false' if answers.key?('foreman_proxy_content')
       options
     end
 
diff --git a/test/definitions/procedures/puppet/remove_puppet_test.rb b/test/definitions/procedures/puppet/remove_puppet_test.rb
index bbec8bb22..f3e0aa0c4 100644
--- a/test/definitions/procedures/puppet/remove_puppet_test.rb
+++ b/test/definitions/procedures/puppet/remove_puppet_test.rb
@@ -41,7 +41,6 @@
         '--no-enable-foreman-plugin-puppet',
         '--foreman-proxy-puppet false',
         '--foreman-proxy-puppetca false',
-        '--foreman-proxy-content-puppet false',
         '--no-enable-puppet'
       ]
       _(subject.send(:installer_arguments_disabling_puppet).sort).must_equal expected_arguments.sort
@@ -52,7 +51,6 @@
       expected_arguments = [
         '--foreman-proxy-puppet false',
         '--foreman-proxy-puppetca false',
-        '--foreman-proxy-content-puppet false',
         '--no-enable-puppet'
       ]
       _(subject.send(:installer_arguments_disabling_puppet).sort).must_equal expected_arguments.sort