(dhcp::server::base) updated classname "dhcp::params", and updates filenames

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index d997ad1b12c9a9611b10af2e4970b81d56178566..34639a75349fb588dad903790610717ddf9f3556 100644 (file)
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -10,25 +10,24 @@ class dhcp::server::base {
   include dhcp::params
   package {"dhcp-server":
     ensure => present,
-    name   => $dhcp::variables::srv_dhcpd,
+    name   => $dhcp::params::srv_dhcpd,
   }
 
   service {"dhcpd":
-    name    => $dhcp::variables::srv_dhcpd,
+    name    => $dhcp::params::srv_dhcpd,
     ensure  => running,
     enable  => true,
     require => Package["dhcp-server"],
   }
 
   common::concatfilepart {"00.dhcp.server.base":
-    file    => "${dhcp::variables::config_dir}/dhcpd.conf",
+    file    => "${dhcp::params::config_dir}/dhcpd.conf",
     ensure  => present,
     require => Package["dhcp-server"],
     notify  => Service["dhcpd"],
   }
 
-  file {"dhcp-subnet-config-dir":
-    path   => "${dhcp::variables::config_dir}/subnets",
+  file {"${dhcp::params::config_dir}/subnets":
     ensure => directory,
     require => Package["dhcp-server"],
     notify  => Service["dhcpd"],
@@ -38,8 +37,7 @@ class dhcp::server::base {
     source  => "puppet:///dhcp/empty"
   }
 
-  file {"dhcp-config-dir":
-    path   => "${dhcp::variables::config_dir}/hosts.d",
+  file {"${dhcp::params::config_dir}/hosts.d":
     ensure => directory,
     require => Package["dhcp-server"],
     recurse => true,