Fixed lint errors on record manifests

ajjahn · Apr 22, 2014 · 6bf0dbf · 6bf0dbf
1 parent ba00d09
commit 6bf0dbf
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -8,6 +8,7 @@ PuppetLint.configuration.fail_on_warnings = true
 
 # Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
 # http://puppet-lint.com/checks/class_parameter_defaults/
+PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 # http://puppet-lint.com/checks/class_inherits_from_params_class/
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')

diff --git a/manifests/record.pp b/manifests/record.pp
@@ -1,3 +1,7 @@
+# == Define dns::record
+#
+# This is a private class to arbitary dns records.
+#
 define dns::record (
   $zone,
   $host,

diff --git a/manifests/record/a.pp b/manifests/record/a.pp
@@ -1,3 +1,8 @@
+# == Define dns::record::a
+#
+# Wrapper for dns::record to set an A record, optionally
+# also setting a PTR at the same time.
+#
 define dns::record::a (
   $zone,
   $data,
@@ -19,7 +24,7 @@
     $reverse_zone = inline_template('<%= @ip.split(".")[0..-2].reverse.join(".") %>.IN-ADDR.ARPA')
     $octet = inline_template('<%= @ip.split(".")[-1] %>')
 
-    dns::record::ptr { "$octet.${reverse_zone}":
+    dns::record::ptr { "${octet}.${reverse_zone}":
       host => $octet,
       zone => $reverse_zone,
       data => "${host}.${zone}"

diff --git a/manifests/record/aaaa.pp b/manifests/record/aaaa.pp
@@ -1,3 +1,7 @@
+# == Define: dns::record::aaaa
+#
+# Wrapper of dns::record to set AAAA records
+#
 define dns::record::aaaa (
   $zone,
   $data,

diff --git a/manifests/record/cname.pp b/manifests/record/cname.pp
@@ -1,3 +1,7 @@
+# == Define dns::record::dname
+#
+# Wrapper for dns::record to set a CNAME
+#
 define dns::record::cname (
   $zone,
   $data,

diff --git a/manifests/record/mx.pp b/manifests/record/mx.pp
@@ -1,3 +1,7 @@
+# == Define: dns::record::mx
+#
+# Wrapper for dns::record to set an XM record.
+#
 define dns::record::mx (
   $zone,
   $data,

diff --git a/manifests/record/ptr.pp b/manifests/record/ptr.pp
@@ -1,8 +1,13 @@
+# == Define dns::record::prt
+#
+# Wrapper for dns::record to set PTRs
+#
 define dns::record::ptr (
   $zone,
   $data,
   $ttl = '',
-  $host = $name ) {
+  $host = $name
+) {
 
   $alias = "${host},PTR,${zone}"
 

diff --git a/manifests/record/srv.pp b/manifests/record/srv.pp
@@ -1,12 +1,17 @@
+# == Define dns::server:srv
+#
+# Wrapper for dns::zone to set SRV records
+#
 define dns::record::srv (
   $zone,
   $service,
-  $proto = "tcp",
   $pri,
   $weight,
   $port,
   $target,
-  $ttl = '') {
+  $proto = 'tcp',
+  $ttl = '',
+) {
 
   $alias = "${service}:${proto}@${target}:${port},${pri},${weight},SRV,${zone}"
 

diff --git a/manifests/record/txt.pp b/manifests/record/txt.pp
@@ -1,3 +1,7 @@
+# == Define dns::record::txt
+#
+# Wrapper for dns::record for TXT records
+#
 define dns::record::txt (
   $zone,
   $data,