Skip to content

Commit 67a68df

Browse files
evgeniekohl
authored andcommitted
cleanup Ubuntu pre-20.04 code
We dropped support for 18.04 a while ago, but didn't clean up all the conditionals. Fixes: c5453d6
1 parent 44f6c82 commit 67a68df

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

manifests/plugin/ansible/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$runner_package_name = 'ansible-runner'
1919
}
2020
'Debian': {
21-
if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0) {
21+
if ($facts['os']['name'] == 'Ubuntu') {
2222
$callback = 'theforeman.foreman.foreman'
2323
} else {
2424
$callback = 'foreman'

spec/acceptance/netboot_spec.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@
55

66
include_examples 'the example', 'tftp.pp'
77

8-
root = case host_inventory['facter']['os']['name']
8+
root = case host_inventory['facter']['os']['family']
99
when 'Debian'
1010
'/srv/tftp'
11-
when 'Ubuntu'
12-
if host_inventory['facter']['os']['release']['major'].to_f >= 20.04
13-
'/srv/tftp'
14-
else
15-
'/var/lib/tftpboot'
16-
end
1711
else
1812
'/var/lib/tftpboot'
1913
end

0 commit comments

Comments
 (0)