Some lint fixes and refactorings.

briehman · Jul 7, 2015 · 33a8351 · 33a8351
1 parent c7d6d62
commit 33a8351
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/manifests/config/module.pp b/manifests/config/module.pp
@@ -1,16 +1,14 @@
 #
 # Module installation
 #
-define wildfly::config::module($source = undef, $dependencies = [], $system = true) {
+define wildfly::config::module($system = true, $source = undef, $dependencies = []) {
 
   require wildfly::install
 
   $namespace_path = regsubst($name, '[.]', '/', 'G')
+
   if $system {
-    $module_dir = "system/layers/base"
-  }
-  else {
-    $module_dir = ""
+    $module_dir = 'system/layers/base'
   }
 
   File {
@@ -34,7 +32,7 @@
   $file_name = inline_template('<%= File.basename(URI::parse(@source).path) %>')
 
   archive { "${dir_path}/${file_name}":
-    source        => $source,
+    source => $source,
   }
   ->
   file { "${dir_path}/${file_name}":

diff --git a/manifests/util/resource.pp b/manifests/util/resource.pp
@@ -1,16 +1,16 @@
 #
 # Uses wildfly_resource to ensure configuration state
 #
-define wildfly::util::resource($content = undef, $recursive = false, $ensure = 'present') {
+define wildfly::util::resource($ensure = 'present', $content = undef, $recursive = false) {
 
   wildfly_resource { $name:
+    ensure    => $ensure,
     username  => $::wildfly::users_mgmt['wildfly']['username'],
     password  => $::wildfly::users_mgmt['wildfly']['password'],
     host      => $::wildfly::mgmt_bind,
     port      => $::wildfly::mgmt_http_port,
     recursive => $recursive,
     state     => $content,
-    ensure    => $ensure
   }
 
 }