From ec52b52f8227e10a3724c21dde337a424bdcfe27 Mon Sep 17 00:00:00 2001 From: Cedric Jeanneret <cedric.jeanneret@camptocamp.com> Date: Tue, 26 Feb 2013 14:29:55 +0100 Subject: updated and corrected template and dhcp::hosts --- templates/host.conf.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'templates') 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 -%> -- cgit v1.2.3