File tree Expand file tree Collapse file tree 2 files changed +1
-4
lines changed
definitions/procedures/puppet
test/definitions/procedures/puppet Expand file tree Collapse file tree 2 files changed +1
-4
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ class RemovePuppet < ForemanMaintain::Procedure
44 description 'Remove Puppet feature'
55 confine do
66 feature ( :puppet_server ) &&
7- ( check_min_version ( 'foreman' , '3.0 ' ) || check_min_version ( 'foreman-proxy' , '3.0 ' ) )
7+ ( check_min_version ( 'foreman' , '3.6 ' ) || check_min_version ( 'foreman-proxy' , '3.6 ' ) )
88 end
99 advanced_run false
1010 end
@@ -42,7 +42,6 @@ def installer_arguments_disabling_puppet
4242 options << '--foreman-proxy-puppet false'
4343 options << '--foreman-proxy-puppetca false'
4444 end
45- options << '--foreman-proxy-content-puppet false' if answers . key? ( 'foreman_proxy_content' )
4645 options
4746 end
4847
Original file line number Diff line number Diff line change 4141 '--no-enable-foreman-plugin-puppet' ,
4242 '--foreman-proxy-puppet false' ,
4343 '--foreman-proxy-puppetca false' ,
44- '--foreman-proxy-content-puppet false' ,
4544 '--no-enable-puppet'
4645 ]
4746 _ ( subject . send ( :installer_arguments_disabling_puppet ) . sort ) . must_equal expected_arguments . sort
5251 expected_arguments = [
5352 '--foreman-proxy-puppet false' ,
5453 '--foreman-proxy-puppetca false' ,
55- '--foreman-proxy-content-puppet false' ,
5654 '--no-enable-puppet'
5755 ]
5856 _ ( subject . send ( :installer_arguments_disabling_puppet ) . sort ) . must_equal expected_arguments . sort
You can’t perform that action at this time.
0 commit comments