(dhcp) renamed files so that we see they comes from dhcp module

This will prevent duplicated definitions.

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index 24108965c39f0f6022a3ddd4a5f1539b256358a6..d997ad1b12c9a9611b10af2e4970b81d56178566 100644 (file)
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -20,14 +20,14 @@ class dhcp::server::base {
     require => Package["dhcp-server"],
   }
 
-  common::concatfilepart {"00-base":
+  common::concatfilepart {"00.dhcp.server.base":
     file    => "${dhcp::variables::config_dir}/dhcpd.conf",
     ensure  => present,
     require => Package["dhcp-server"],
     notify  => Service["dhcpd"],
   }
 
-  file {"subnet-config-dir":
+  file {"dhcp-subnet-config-dir":
     path   => "${dhcp::variables::config_dir}/subnets",
     ensure => directory,
     require => Package["dhcp-server"],

diff --git a/manifests/classes/dhcp-server-debian.pp b/manifests/classes/dhcp-server-debian.pp
index b1056bec65e424057a5385ed9bb140b4e1170283..976238411453a86344274eba6ec75f734baa8f6f 100644 (file)
--- a/manifests/classes/dhcp-server-debian.pp
+++ b/manifests/classes/dhcp-server-debian.pp
@@ -8,7 +8,7 @@ This class should not be included as is, please include "dhcp::server" instead.
 */
 class dhcp::server::debian inherits dhcp::server::base {
 
-  Common::Concatfilepart["00-base"] {
+  Common::Concatfilepart["00.dhcp.server.base"] {
     content => template('dhcp/dhcpd.conf.debian.erb'),
   }