Project

General

Profile

« Previous | Next » 

Revision 7afb89ba

Added by Frank Wall over 8 years ago

fix path to dhcpd.conf on FreeBSD

closes GH-208

View differences:

manifests/params.pp
$puppetssh_command = '/usr/local/bin/puppet agent --onetime --no-usecacheonfailure'
$dhcp_config = '/usr/local/etc/dhcp/dhcpd.conf'
$dhcp_config = '/usr/local/etc/dhcpd.conf'
$dhcp_leases = '/var/db/dhcpd/dhcpd.leases'
$keyfile = '/usr/local/etc/namedb/rndc.key'
spec/classes/foreman_proxy__config__spec.rb
})
end
dhcp_interface = case facts[:osfamily]
when 'FreeBSD', 'DragonFly'
'lo0'
else
'lo'
end
case facts[:osfamily]
when 'FreeBSD', 'DragonFly'
dhcp_interface = 'lo0'
dhcp_leases = '/var/db/dhcpd/dhcpd.leases'
dhcp_config = "#{etc_dir}/dhcpd.conf"
when 'Debian'
dhcp_interface = 'lo'
dhcp_leases = '/var/lib/dhcp/dhcpd.leases'
dhcp_config = "#{etc_dir}/dhcp/dhcpd.conf"
else
dhcp_interface = 'lo'
dhcp_leases = '/var/lib/dhcpd/dhcpd.leases'
dhcp_config = "#{etc_dir}/dhcp/dhcpd.conf"
end
let :pre_condition do
"class {'foreman_proxy':
......
}"
end
dhcp_leases = case facts[:osfamily]
when 'Debian'
'/var/lib/dhcp/dhcpd.leases'
when 'FreeBSD', 'DragonFly'
'/var/db/dhcpd/dhcpd.leases'
else
'/var/lib/dhcpd/dhcpd.leases'
end
it 'should generate correct dhcp.yml' do
verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/dhcp.yml", [
'---',
......
it 'should generate correct dhcp_isc.yml' do
verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/dhcp_isc.yml", [
'---',
":config: #{etc_dir}/dhcp/dhcpd.conf",
":config: #{dhcp_config}",
":leases: #{dhcp_leases}",
':omapi_port: 7911',
])
......
':enabled: https',
':dhcp_vendor: isc',
':dhcp_server: 127.0.0.1',
":dhcp_config: #{etc_dir}/dhcp/dhcpd.conf",
":dhcp_config: #{dhcp_config}",
":dhcp_leases: #{dhcp_leases}",
':dhcp_omapi_port: 7911',
])

Also available in: Unified diff