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

network: Lint and style fixes

Browse source
This commit is contained in:
Ossi Salmi 2013-12-03 13:41:21 +02:00
parent d314f408c5
commit f0ba468fcc
1 changed files with 73 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
network/manifests/init.pp
View file

@ -1,9 +1,9 @@
# Class which restarts networking if needed. # Class which restarts networking if needed.
# #
# This class is automatically included when needed. # This class is automatically included when needed.
# #
class network::helper::restart { class network::helper::restart {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat","fedora": { "centos","redhat","fedora": {
exec { "restart-network": exec { "restart-network":
@ -27,7 +27,9 @@ class network::helper::restart {
refreshonly => true, refreshonly => true,
} }
} }
default: {}
} }
} }
@ -154,21 +156,29 @@ class network::hostname {
# netmask => "255.255.0.0", # netmask => "255.255.0.0",
# } # }
# #
define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", define network::interface(
$dnsnameservers = "none", $dnssearch = "none", $ipaddr="none",
$ip6addr = "none", $ip6netmask = "64", $eaddr="none",
$bridge = [], $options = [], $postcmd = []) { $netmask="none",
$dnsnameservers="none",
$dnssearch="none",
$ip6addr="none",
$ip6netmask="64",
$bridge=[],
$options=[],
$postcmd=[]
) {
include network::helper::restart include network::helper::restart
# try to determine boot protocol from ip address # try to determine boot protocol from ip address
case $ipaddr { case $ipaddr {
dhcp: { $proto = "dhcp" } "dhcp": { $proto = "dhcp" }
none: { $proto = "none" } "none": { $proto = "none" }
default: { default: {
$proto = "static" $proto = "static"
case $netmask { if $netmask == "none" {
none: { fail("Netmask must be defined with ip address") } fail("Netmask must be defined with ip address")
} }
} }
} }
@ -251,28 +261,28 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
# #
# $name: # $name:
# Destination network or default for default route. # Destination network or default for default route.
# $device:
# Interface to use for this route.
# $gateway: # $gateway:
# Gateway address. # Gateway address.
# $ipv6gateway: # $ipv6gateway:
# IPv6 gateway address. # IPv6 gateway address.
# $device:
# Interface to use for this route.
# #
define network::route($gateway = "", $device, $ipv6gateway = "") { define network::route($device, $gateway="", $ipv6gateway="") {
case $name { case $name {
"default": { "default": {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat","fedora": { "centos","redhat","fedora": {
include network::helper::restart include network::helper::restart
if "${gateway}" != "" { if $gateway != "" {
augeas { "set-default-route": augeas { "set-default-route":
context => "/files/etc/sysconfig/network", context => "/files/etc/sysconfig/network",
changes => "set GATEWAY ${gateway}", changes => "set GATEWAY ${gateway}",
notify => Exec["restart-network"], notify => Exec["restart-network"],
} }
} }
if "${ipv6gateway}" != "" { if $ipv6gateway != "" {
augeas { "set-default-ipv6-route": augeas { "set-default-ipv6-route":
context => "/files/etc/sysconfig/network", context => "/files/etc/sysconfig/network",
changes => "set IPV6_DEFAULTGW ${ipv6gateway}", changes => "set IPV6_DEFAULTGW ${ipv6gateway}",
@ -285,7 +295,7 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
notify => Exec["restart-network"], notify => Exec["restart-network"],
} }
} }
openbsd: { "openbsd": {
include network::helper::restart include network::helper::restart
file { "/etc/mygate": file { "/etc/mygate":
ensure => present, ensure => present,
@ -296,7 +306,7 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
notify => Exec["restart-network"], notify => Exec["restart-network"],
} }
} }
debian,ubuntu: { "debian","ubuntu": {
include network::helper::restart include network::helper::restart
include network::helper::debian include network::helper::debian
file { "/etc/network/interfaces.d/${device}-gate.conf": file { "/etc/network/interfaces.d/${device}-gate.conf":
@ -363,7 +373,8 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
# password => "secret", # password => "secret",
# } # }
# #
define network::carp($password, $ipaddr, $netmask, $options = [], $postcmd = []) { define network::carp($password, $ipaddr, $netmask, $options=[], $postcmd=[]) {
case $::operatingsystem { case $::operatingsystem {
"openbsd": { "openbsd": {
$carp_options = [ "vhid ${name}", "pass ${password}" ] $carp_options = [ "vhid ${name}", "pass ${password}" ]
@ -391,6 +402,7 @@ define network::carp($password, $ipaddr, $netmask, $options = [], $postcmd = [])
fail("Network module not supported in ${::operatingsystem}") fail("Network module not supported in ${::operatingsystem}")
} }
} }
} }
@ -399,6 +411,7 @@ define network::carp($password, $ipaddr, $netmask, $options = [], $postcmd = [])
# This class is automatically included by network::carp when needed. # This class is automatically included by network::carp when needed.
# #
class network::ucarp { class network::ucarp {
package { "ucarp": package { "ucarp":
ensure => installed, ensure => installed,
} }
@ -408,6 +421,7 @@ class network::ucarp {
hasstatus => true, hasstatus => true,
require => Package["ucarp"], require => Package["ucarp"],
} }
} }
@ -426,7 +440,7 @@ class network::ucarp {
# $authtype: # $authtype:
# Authentication method to use. Defaults to PAP. # Authentication method to use. Defaults to PAP.
# #
define network::pppoe($username, $password, $device, $authtype = "pap") { define network::pppoe($username, $password, $device, $authtype="pap") {
include network::helper::restart include network::helper::restart
@ -472,7 +486,14 @@ define network::pppoe($username, $password, $device, $authtype = "pap") {
# netmask => "255.255.0.0", # netmask => "255.255.0.0",
# } # }
# #
define network::trunk($devices, $mode = 0, $ipaddr = "none", $netmask = "none", $options = []) { define network::trunk(
$devices,
$mode="0",
$ipaddr="none",
$netmask="none",
$options=[]
) {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat","fedora": { "centos","redhat","fedora": {
file { "/etc/modprobe.d/${name}.conf": file { "/etc/modprobe.d/${name}.conf":
@ -505,6 +526,7 @@ define network::trunk($devices, $mode = 0, $ipaddr = "none", $netmask = "none",
# This class is automatically included when needed. # This class is automatically included when needed.
# #
class network::helper::vlan { class network::helper::vlan {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat","fedora": { "centos","redhat","fedora": {
augeas { "enable-vlan-support": augeas { "enable-vlan-support":
@ -512,7 +534,9 @@ class network::helper::vlan {
changes => "set VLAN yes", changes => "set VLAN yes",
} }
} }
default: {}
} }
} }
@ -539,8 +563,13 @@ class network::helper::vlan {
# netmask => "255.255.0.0", # netmask => "255.255.0.0",
# } # }
# #
define network::vlan($device, $ipaddr = "none", $netmask = "none", define network::vlan(
$options = []) { $device,
$ipaddr="none",
$netmask = "none",
$options=[]
) {
case $::operatingsystem { case $::operatingsystem {
"openbsd": { "openbsd": {
network::interface { "vlan${name}": network::interface { "vlan${name}":
@ -562,6 +591,7 @@ define network::vlan($device, $ipaddr = "none", $netmask = "none",
fail("Network module not supported in ${::operatingsystem}") fail("Network module not supported in ${::operatingsystem}")
} }
} }
} }
@ -569,33 +599,32 @@ define network::vlan($device, $ipaddr = "none", $netmask = "none",
# #
class network::manager::disable { class network::manager::disable {
case $::operatingsystem { if $::operatingsystem == "Ubuntu" {
ubuntu: { file { "/etc/init/network-manager.conf":
file { "/etc/init/network-manager.conf": ensure => present,
ensure => present, mode => "0644",
mode => "0644", owner => root,
owner => root, group => root,
group => root, source => "puppet:///modules/network/network-manager.disabled.conf",
source => "puppet:///modules/network/network-manager.disabled.conf", }
} xdg::autostart { "nm-applet":
xdg::autostart { "nm-applet": enable => false,
enable => false,
}
} }
} }
service { "network-manager": service { "network-manager":
ensure => stopped,
enable => false,
hasstatus => true,
name => $::operatingsystem ? { name => $::operatingsystem ? {
ubuntu => "network-manager", ubuntu => "network-manager",
default => "NetworkManager", default => "NetworkManager",
}, },
ensure => stopped,
enable => false,
hasstatus => true,
} }
} }
# Define IPv6 prefixes for advertisement # Define IPv6 prefixes for advertisement
# #
# === Sample usage # === Sample usage
@ -603,7 +632,10 @@ class network::manager::disable {
# network::routeradvertisement::ipv6prefix { "em1": # network::routeradvertisement::ipv6prefix { "em1":
# prefix => "2001:db8:c0de:cafe::/64" # prefix => "2001:db8:c0de:cafe::/64"
# } # }
define network::routeradvertisement::ipv6prefix($prefix = "", $description = "") { define network::routeradvertisement::ipv6prefix(
$prefix="",
$description=""
) {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { "centos","redhat": {
@ -644,7 +676,7 @@ define network::routeradvertisement::ipv6prefix($prefix = "", $description = "")
} }
} }
default: { default: {
fail("Router advertisement not supported in $::operatingsystem.") fail("Router advertisement not supported in $::{operatingsystem}")
} }
} }
@ -654,6 +686,7 @@ define network::routeradvertisement::ipv6prefix($prefix = "", $description = "")
# Router Advertisement daemon # Router Advertisement daemon
# #
class network::routeradvertisement { class network::routeradvertisement {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { "centos","redhat": {
package { "radvd": package { "radvd":
@ -686,7 +719,8 @@ class network::routeradvertisement {
# Only network::ipv6network is needed for OpenBSD # Only network::ipv6network is needed for OpenBSD
} }
default: { default: {
fail("Router advertisement not supported in $::operatingsystem") fail("Router advertisement not supported in $::{operatingsystem}")
} }
} }
} }