From 12bda76ab963d43b2b9e6b80164b48a737147737 Mon Sep 17 00:00:00 2001
From: Stefan - Zipkid - Goethals <stefan.goethals@vrt.be>
Date: Wed, 27 Jan 2016 09:49:31 +0100
Subject: [PATCH] - fix conflicts when using bind::updater on all nodes.

---
 manifests/init.pp    | 11 ++++++-----
 manifests/updater.pp |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a8314e3..d38b3d7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,11 +20,12 @@ class bind (
         notify  => Service['bind'],
     }
 
-    package{'bind-tools':
-        ensure => latest,
-        name   => $nsupdate_package,
-        before => Package['bind'],
-    }
+    include ::bind::updater
+    # package{'bind-tools':
+    #     ensure => latest,
+    #     name   => $nsupdate_package,
+    #     before => Package['bind'],
+    # }
 
     package { 'bind':
         ensure => latest,
diff --git a/manifests/updater.pp b/manifests/updater.pp
index a40e389..c90aedf 100644
--- a/manifests/updater.pp
+++ b/manifests/updater.pp
@@ -5,13 +5,13 @@ class bind::updater (
 ) inherits bind::defaults {
 
     if $nsupdate_package {
-        package { 'nsupdate':
+        package { 'bind-tools':
             ensure => present,
             name   => $nsupdate_package,
         }
     }
 
-    class { 'bind::keydir':
-        keydir => $keydir,
-    }
+    # class { 'bind::keydir':
+    #     keydir => $keydir,
+    # }
 }