aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Jeanneret <cedric.jeanneret@camptocamp.com>2013-02-26 14:29:55 +0100
committerCedric Jeanneret <cedric.jeanneret@camptocamp.com>2013-02-26 14:29:55 +0100
commitec52b52f8227e10a3724c21dde337a424bdcfe27 (patch)
treed897d6ab4dd59c94ed40dc3333006a115700ca49
parent3fbb21df04f007d76f5c816e0ba7a3bd09fade54 (diff)
downloadpuppet-dhcp-ec52b52f8227e10a3724c21dde337a424bdcfe27.tar.gz
puppet-dhcp-ec52b52f8227e10a3724c21dde337a424bdcfe27.tar.bz2
updated and corrected template and dhcp::hosts
-rw-r--r--manifests/hosts.pp4
-rw-r--r--templates/host.conf.erb6
2 files changed, 8 insertions, 2 deletions
diff --git a/manifests/hosts.pp b/manifests/hosts.pp
index fd99600..b159449 100644
--- a/manifests/hosts.pp
+++ b/manifests/hosts.pp
@@ -4,6 +4,9 @@
#
# Arguments
# $template: dhcp host template - default: 'dhcp/host.conf.erb'
+# $global_options: global options for the whole bunch of hosts.
+# you may override it per host, setting the host "options"
+# directly in the hash.
# $subnet: targeted subnet
# $hash_data: hash containing data - default form:
# {
@@ -35,6 +38,7 @@
define dhcp::hosts (
$hash_data,
$subnet,
+ $global_options = false,
$template = 'dhcp/host.conf.erb',
) {
diff --git a/templates/host.conf.erb b/templates/host.conf.erb
index c3514d3..e6a7073 100644
--- a/templates/host.conf.erb
+++ b/templates/host.conf.erb
@@ -3,12 +3,14 @@
host <%= host %>-<%= if_name %> {
hardware ethernet <%= if_mac %>;
<% if datas.fetch('fixed_address', false) -%>
- fixed-address <%= datas.fetch('fixed_address') %>
+ fixed-address <%= datas.fetch('fixed_address') %>;
<% else -%>
- fixed-address <%= host %>
+ fixed-address <%= host %>;
<% end -%>
<% if datas.fetch('option', false) -%>
<%= datas.fetch('option') %>
+<% elsif @global_options -%>
+ <%= @global_options %>
<% end -%>
}
<% end -%>