From 2592ca9fad0e2440685b6342e6c2f031f7d2a656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Mon, 10 May 2010 23:58:29 +0300
Subject: [PATCH] Clean up for network::interface definition.

---
 network/manifests/init.pp         | 7 ++-----
 network/templates/hostname.if.erb | 7 ++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index 718aa96..072dd4c 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -31,7 +31,7 @@ class network::helper::restart {
 #       Network device name.
 #   $ipaddr:
 #	IP address for interface. Use dhcp for DHCP configuration and none
-#	if interface just needs to be brought up.
+#	if interface just needs to be brought up. Defaults to none.
 #   $netmask:
 #	Netmask for interface. Required only when $ipaddr is used.
 #   $options:
@@ -64,10 +64,7 @@ define network::interface($options = [], $ipaddr = "none", $netmask = "none") {
 	openbsd: {
 	    file { "/etc/hostname.${name}":
 		ensure  => present,
-		content => $proto ? {
-		    none    => "up\n",
-		    default => template("network/hostname.if.erb"),
-		},
+		content => template("network/hostname.if.erb"),
 		mode    => 0600,
 		owner   => root,
 		group   => wheel,
diff --git a/network/templates/hostname.if.erb b/network/templates/hostname.if.erb
index 1de93a3..38c88a3 100644
--- a/network/templates/hostname.if.erb
+++ b/network/templates/hostname.if.erb
@@ -1,6 +1,7 @@
 <% if proto == 'dhcp' -%>
-dhcp NONE NONE NONE<% options.each do |val| -%> <%= val -%><% end -%>
+dhcp NONE NONE NONE<% options.each do |val| %> <%= val %><% end %>
+<% elsif proto == 'none' -%>
+up
 <% else -%>
-inet <%= ipaddr -%> <%= netmask -%> NONE<% options.each do |val| -%> <%= val -%><% end -%>
+inet <%= ipaddr %> <%= netmask %> NONE<% options.each do |val| %> <%= val %><% end %>
 <% end -%>
-