Configure external address for fafnir

[chef.git] / cookbooks / networking / templates / default / interfaces.erb

diff --git a/cookbooks/networking/templates/default/interfaces.erb b/cookbooks/networking/templates/default/interfaces.erb
index 33cc6620f529949f60fbad54a63fa6866bc804bc..50238cb5f885ff16cb55970d1c7173c4ceb9c9b7 100644 (file)
--- a/cookbooks/networking/templates/default/interfaces.erb
+++ b/cookbooks/networking/templates/default/interfaces.erb
@@ -2,11 +2,10 @@
 
 iface lo inet loopback
 <% node[:networking][:interfaces].each do |name,interface| -%>
+<% if interface[:interface] -%>
 
-iface <%= interface[:interface] %> <%= interface[:family] %> <%= interface[:method] %>
-<% if interface[:address] -%>
+iface <%= interface[:interface] %> <%= interface[:family] %> static
       address   <%= interface[:address] %>
-<% end -%>
 <% if interface[:family] == "inet" -%>
       netmask   <%= interface[:netmask] %>
 <% elsif interface[:family] == "inet6" -%>
@@ -33,5 +32,6 @@ iface <%= interface[:interface] %> <%= interface[:family] %> <%= interface[:meth
       autoconf  0
 <% end -%>
 <% end -%>
+<% end -%>
 
-auto lo <%= node[:networking][:interfaces].collect { |n,i| i[:interface] }.sort.uniq.join(" ") %>
+auto lo <%= node[:networking][:interfaces].collect { |n,i| i[:interface] }.compact.sort.uniq.join(" ") %>