network: Compatibility fix for puppetmaster 2.6

This commit is contained in:
Ossi Salmi 2013-12-03 13:03:17 +02:00
parent a247044743
commit d314f408c5

View file

@ -366,11 +366,13 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
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_postcmd = [ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ]
network::interface { "carp${name}": network::interface { "carp${name}":
ipaddr => $ipaddr, ipaddr => $ipaddr,
netmask => $netmask, netmask => $netmask,
options => merge([ "vhid ${name}", "pass ${password}", ], $options), options => merge($carp_options, $options),
postcmd => merge("/usr/sbin/ndp -i carp${name} -- -accept_rtadv", $postcmd), postcmd => merge($carp_postcmd, $postcmd),
} }
} }
"centos","redhat","fedora": { "centos","redhat","fedora": {