Create missing directory, and take the opportunity to rename it

diff --git a/manifests/failover.pp b/manifests/failover.pp
index 6b465f20f2276aa4d93b7c84febf54256a293658..cfcccb0e99a18a89582511c7e7c9d162a31f17b5 100644 (file)
--- a/manifests/failover.pp
+++ b/manifests/failover.pp
@@ -23,7 +23,7 @@ define dhcp::failover(
     default   => $ensure,
   }
 
-  file {"${dhcp::params::config_dir}/failover/${name}.conf":
+  file {"${dhcp::params::config_dir}/failover.d/${name}.conf":
     ensure  => $_ensure,
     content => template("${module_name}/failover.conf.erb"),
     group   => 'root',
@@ -34,7 +34,7 @@ define dhcp::failover(
 
   concat::fragment {"dhcp.failover.${name}":
     ensure  => $ensure,
-    content => "include \"${dhcp::params::config_dir}/failover/${name}.conf\";\n",
+    content => "include \"${dhcp::params::config_dir}/failover.d/${name}.conf\";\n",
     target  => "${dhcp::params::config_dir}/dhcpd.conf",
   }
 

diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index eb2efa12486147ecc08dfc0d4b0f10b2730ea8a7..68e2104b1d76cd0730b0e29db9ec5e735b67804c 100644 (file)
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -52,4 +52,11 @@ class dhcp::server::config {
     purge   => true,
     force   => true,
   }
+
+  file {"${dhcp::params::config_dir}/failover.d":
+    ensure  => directory,
+    recurse => true,
+    purge   => true,
+    force   => true,
+  }
 }