aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Jeanneret <cedric.jeanneret@camptocamp.com>2015-11-05 08:55:56 +0100
committerCédric Jeanneret <cedric.jeanneret@camptocamp.com>2015-11-05 08:55:56 +0100
commit24d4dfa1c2256db068b51115828bbc12e247d7f2 (patch)
treefc6fc79b1bedb446c924634294482ac73af853cd
parentb5ee63a48adbea3e50300e2c0c26c575ec1b5abb (diff)
downloadpuppet-dhcp-24d4dfa1c2256db068b51115828bbc12e247d7f2.tar.gz
puppet-dhcp-24d4dfa1c2256db068b51115828bbc12e247d7f2.tar.bz2
Create missing directory, and take the opportunity to rename it
-rw-r--r--manifests/failover.pp4
-rw-r--r--manifests/server/config.pp7
2 files changed, 9 insertions, 2 deletions
diff --git a/manifests/failover.pp b/manifests/failover.pp
index 6b465f2..cfcccb0 100644
--- 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 eb2efa1..68e2104 100644
--- 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,
+ }
}