From 6ac1a1cefa3d5296c695bfa0f40264532041f956 Mon Sep 17 00:00:00 2001
From: Nate Riffe <nriffe@backstopsolutions.com>
Date: Tue, 4 Sep 2012 12:39:35 -0500
Subject: [PATCH] Avoid naming collision

---
 manifests/zone.pp       | 2 +-
 templates/zone.conf.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/zone.pp b/manifests/zone.pp
index 30c5eaa..751ecd3 100644
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -1,5 +1,5 @@
 define bind::zone (
-	$type,
+	$zone_type,
 	$domain          = '',
 	$masters         = [],
 	$allow_updates   = [],
diff --git a/templates/zone.conf.erb b/templates/zone.conf.erb
index 51ae671..3dd21c9 100644
--- a/templates/zone.conf.erb
+++ b/templates/zone.conf.erb
@@ -1,7 +1,7 @@
 
 # This file managed by puppet - changes will be lost
 zone "<%= _domain %>" {
-	type <%= type %>;
+	type <%= zone_type %>;
 <%- if file != '' -%>
 	file "<%= file %>";
 <%- end -%>