From 7783d04b4e28ecd116420a3f6538794f636c6623 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Mon, 27 Mar 2023 14:17:59 -0400 Subject: [PATCH] Puppet removal parameter to installer is no longer used --- definitions/procedures/puppet/remove_puppet.rb | 1 - test/definitions/procedures/puppet/remove_puppet_test.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/definitions/procedures/puppet/remove_puppet.rb b/definitions/procedures/puppet/remove_puppet.rb index ad4700401..cb84c3e33 100644 --- a/definitions/procedures/puppet/remove_puppet.rb +++ b/definitions/procedures/puppet/remove_puppet.rb @@ -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