From d314f408c5d62af847dd566d3558e00df9e7b87f Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 3 Dec 2013 13:03:17 +0200
Subject: [PATCH] network: Compatibility fix for puppetmaster 2.6

---
 network/manifests/init.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index 7e5d7b5..661d1e6 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -366,11 +366,13 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
 define network::carp($password, $ipaddr, $netmask, $options = [], $postcmd = []) {
     case $::operatingsystem {
         "openbsd": {
+            $carp_options = [ "vhid ${name}", "pass ${password}" ]
+            $carp_postcmd = [ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ]
             network::interface { "carp${name}":
                 ipaddr  => $ipaddr,
                 netmask => $netmask,
-                options => merge([ "vhid ${name}", "pass ${password}", ], $options),
-                postcmd => merge("/usr/sbin/ndp -i carp${name} -- -accept_rtadv", $postcmd),
+                options => merge($carp_options, $options),
+                postcmd => merge($carp_postcmd, $postcmd),
             }
         }
         "centos","redhat","fedora": {