diff options
| -rw-r--r-- | manifests/params.pp | 31 | ||||
| -rw-r--r-- | metadata.json | 3 | ||||
| -rw-r--r-- | spec/classes/dhcp_spec.rb | 16 |
3 files changed, 6 insertions, 44 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 675c779..1270a53 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,31 +4,8 @@ # Set variables for names and paths # class dhcp::params { - - case $::operatingsystem { - - /Debian|Ubuntu/: { - $config_dir = $::lsbdistcodename? { - /lenny|lucid/ => '/etc/dhcp3', - /squeeze|wheezy|precise|trusty/ => '/etc/dhcp', - } - - $srv_dhcpd = $::lsbdistcodename? { - /lenny|lucid/ => 'dhcp3-server', - /squeeze|wheezy|precise|trusty/ => 'isc-dhcp-server', - } - - $service_pattern = $::lsbdistcodename? { - /lenny|lucid/ => '/usr/sbin/dhcpd3', - /squeeze|wheezy|precise|trusty/ => '/usr/sbin/dhcpd', - } - - $server_template = "${module_name}/dhcpd.conf.debian.erb" - } - - default: { - fail "Unsupported OS ${::operatingsystem}/${::lsbdistcodename}" - } - - } + $config_dir = '/etc/dhcp' + $srv_dhcpd = 'isc-dhcp-server' + $service_pattern = '/usr/sbin/dhcpd' + $server_template = "${module_name}/dhcpd.conf.debian.erb" } diff --git a/metadata.json b/metadata.json index 49524bd..1b03612 100644 --- a/metadata.json +++ b/metadata.json @@ -23,7 +23,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { diff --git a/spec/classes/dhcp_spec.rb b/spec/classes/dhcp_spec.rb index d11cf7c..ef2d43d 100644 --- a/spec/classes/dhcp_spec.rb +++ b/spec/classes/dhcp_spec.rb @@ -2,22 +2,6 @@ require 'spec_helper' describe 'dhcp' do - context 'when on an unsupported OS' do - let (:facts) { { - :operatingsystem => 'RedHat', - :osfamily => 'Redhat', - :lsbdistcodename => 'Santiago', - :id => 'root', - :path => '/foo/bar' - } } - - it 'should fail' do - expect { - should contain_package('dhcp-server') - }.to raise_error(Puppet::Error, /Unsupported OS RedHat\/Santiago/) - end - end - on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do |