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.

Sign up for GitHub

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

Fixes #36230 - Puppet removal parameter to installer is no longer used #702

Merged
merged 1 commit into from
Mar 28, 2023
+1 −4
Merged

Fixes #36230 - Puppet removal parameter to installer is no longer used #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions definitions/procedures/puppet/remove_puppet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions test/definitions/procedures/puppet/remove_puppet_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down