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

Fixed DNS templates and added support for Ubuntu 12.04 's way of creating resolv.conf.

Browse source
This commit is contained in:
aes_ng 2012-11-05 16:53:31 +02:00 • committed by Ossi Salmi
parent f72325de30
commit b6d34a1cf2
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
network/manifests/init.pp
View file

@ -109,6 +109,10 @@ class network::hostname {
# Ethernet address. Overrides udev configuration.
# $netmask:
# Netmask for interface. Required only when $ipaddr is used.
# $dnsnameservers:
# IP addresses of DNS name servers (separated by space).
# $dnssearch:
# Search list for domain name lookup (separated by space).
# $ip6addr:
# IPv6 address for interface. Use auto for autoconfigured address.
# Defaults to none.
@ -130,6 +134,7 @@ class network::hostname {
# }
#
define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
$dnsnameservers = "none", $dnssearch = "none",
$ip6addr = "none", $ip6netmask = "64",
$bridge = [], $options = [], $postcmd = []) {

6
network/templates/interfaces-if.erb
View file

@ -11,6 +11,12 @@ iface <%= name %> inet <%= proto %>
<% if netmask != 'none' -%>
netmask <%= netmask %>
<% end -%>
<% if dnssearch != 'none' -%>
dns-search <%= dnssearch %>
<% end -%>
<% if dnsnameservers != 'none' -%>
dns-nameservers <%= dnsnameservers %>
<% end -%>
<% options.each do |val| -%>
<%= val %>
<% end -%>