Updated formatting and cleanup for puppet lint.

tylerwalts · Oct 15, 2014 · 7ac8c41 · 7ac8c41
1 parent 9c3412e
commit 7ac8c41
Show file tree

Hide file tree

Showing 2 changed files with 242 additions and 245 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -115,8 +115,8 @@
       }
     }
 
-    if ! defined(File["${install_dir}"]) {
-      file { "${install_dir}":
+    if ! defined(File[$install_dir]) {
+      file { $install_dir:
         ensure  => directory,
       }
     }
@@ -126,7 +126,7 @@
     if ( $use_cache ){
       file { "${install_dir}/${installerFilename}":
         source  => "${cache_source}${installerFilename}",
-        require => File["${install_dir}"],
+        require => File[$install_dir],
       } ->
       exec { 'get_jdk_installer':
         cwd     => $install_dir,
@@ -174,7 +174,7 @@
     }
 
     # Ensure that files belong to root
-    file {"$java_home":
+    file {$java_home:
       recurse   => true,
       owner     => root,
       group     => root,
@@ -242,14 +242,14 @@
         }
       }
       Suse: {
-	if ( $default_java ) {
+        if ( $default_java ) {
           class { 'jdk_oracle::suse' :
-            version      => $version,
-            version_u    => $version_u,
-            version_b    => $version_b,
-            java_home    => $java_home,
+            version   => $version,
+            version_u => $version_u,
+            version_b => $version_b,
+            java_home => $java_home,
           }
-	}
+        }
       }
 
       default:   { fail('Unsupported OS, implement me?') }