change has_zone_file back to true for the stub zone type and add logic to prevent the file from being created by puppet

This commit is contained in:
Trevor Smith 2015-03-19 13:49:59 -04:00
parent 13723a72cf
commit 55922e8974

View File

@ -28,7 +28,7 @@ define bind::zone (
'master' => true, 'master' => true,
'slave' => true, 'slave' => true,
'hint' => true, 'hint' => true,
'stub' => false, 'stub' => true,
default => false, default => false,
} }
@ -38,7 +38,7 @@ define bind::zone (
} else { } else {
$_source = 'puppet:///modules/bind/db.empty' $_source = 'puppet:///modules/bind/db.empty'
} }
unless $zone_type == 'stub' {
file { "${cachedir}/${name}": file { "${cachedir}/${name}":
ensure => directory, ensure => directory,
owner => $bind::params::bind_user, owner => $bind::params::bind_user,
@ -79,6 +79,7 @@ define bind::zone (
} }
} }
} }
}
file { "${bind::confdir}/zones/${name}.conf": file { "${bind::confdir}/zones/${name}.conf":
ensure => present, ensure => present,