tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged in oherrala/puppet/network-openbsd (pull request #39)

Browse source 
network, openbsd: Move options in OpenBSD to top of /etc/hostname.if so device can be created before using it, etc.
This commit is contained in:
Ossi Salmi 2013-11-06 11:59:44 +02:00
commit 4d5be32073
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
network/templates/hostname.if.erb
View file

@ -1,9 +1,10 @@
<% if @proto == 'dhcp' -%> <%= @options.join("\n")+"\n" unless @options.empty? -%>
dhcp NONE NONE NONE<% @options.each do |val| %> <%= val %><% end %> <% if @proto == 'dhcp' %>
dhcp NONE NONE NONE
<% elsif @proto == 'none' -%> <% elsif @proto == 'none' -%>
up up
<% else -%> <% else -%>
inet <%= @ipaddr %> <%= @netmask %> NONE<% @options.each do |val| %> <%= val %><% end %> inet <%= @ipaddr %> <%= @netmask %> NONE
<% end -%> <% end -%>
<% if @ip6addr == 'auto' -%> <% if @ip6addr == 'auto' -%>
rtsol rtsol