- fix conflicts when using bind::updater on all nodes.

This commit is contained in:
Stefan - Zipkid - Goethals 2016-01-27 09:49:31 +01:00
parent ba06763b96
commit 12bda76ab9
2 changed files with 10 additions and 9 deletions

View File

@ -20,11 +20,12 @@ class bind (
notify => Service['bind'], notify => Service['bind'],
} }
package{'bind-tools': include ::bind::updater
ensure => latest, # package{'bind-tools':
name => $nsupdate_package, # ensure => latest,
before => Package['bind'], # name => $nsupdate_package,
} # before => Package['bind'],
# }
package { 'bind': package { 'bind':
ensure => latest, ensure => latest,

View File

@ -5,13 +5,13 @@ class bind::updater (
) inherits bind::defaults { ) inherits bind::defaults {
if $nsupdate_package { if $nsupdate_package {
package { 'nsupdate': package { 'bind-tools':
ensure => present, ensure => present,
name => $nsupdate_package, name => $nsupdate_package,
} }
} }
class { 'bind::keydir': # class { 'bind::keydir':
keydir => $keydir, # keydir => $keydir,
} # }
} }