updated style formatting

Modulefile

@@ -1,5 +1,5 @@
 name 'aboe-salt'
-version '0.0.2'
+version '0.0.3'
 author 'aboe'
 license 'Apache License, Version 2.0'
 source 'git://github.com/aboe76/puppet-salt.git'

manifests/master.pp

@@ -1,12 +1,13 @@
 class salt::master (
-  $master_config  = $salt::params::master_config,
-  $master_config_template  = $salt::params::master_config_template,
-  $master_package_ensure = $salt::params::master_package_ensure,
-  $master_package_name   = $salt::params::master_package_name,
-  $master_service_ensure = $salt::params::master_service_ensure,
-  $master_service_enable = $salt::params::master_service_enable,
-  $master_service_manage = $salt::params::master_service_manage,
-  $master_service_name = $salt::params::master_service_name,) inherits salt::params {
+  $master_config          = $salt::params::master_config,
+  $master_config_template = $salt::params::master_config_template,
+  $master_package_ensure  = $salt::params::master_package_ensure,
+  $master_package_name    = $salt::params::master_package_name,
+  $master_service_ensure  = $salt::params::master_service_ensure,
+  $master_service_enable  = $salt::params::master_service_enable,
+  $master_service_manage  = $salt::params::master_service_manage,
+  $master_service_name    = $salt::params::master_service_name,) inherits
+salt::params {
   include 'salt::master::install'
   include 'salt::master::config'
   include 'salt::master::service'

manifests/master/config.pp

@@ -1,17 +1,15 @@
 class salt::master::config (
-  $master_config = $salt::master::master_config,
-  $master_template = $salt::master::master_config_template,
-)inherits salt::master{
-
+  $master_config   = $salt::master::master_config,
+  $master_template = $salt::master::master_config_template,) inherits
+salt::master {
   file { $master_config:
-    ensure => file,
-    owner => 0,
-    group => 0,
-    mode  => '0664',
+    ensure  => file,
+    owner   => 0,
+    group   => 0,
+    mode    => '0664',
     content => template($master_template),
     replace => false,
   }
 
-# todo parameterize configuration files
-
+  # todo parameterize configuration files
 }

manifests/master/install.pp

@@ -1,11 +1,8 @@
 class salt::master::install (
   $master_package_ensure = $salt::master::master_package_ensure,
-  $master_package_name   = $salt::master::master_package_name,
-) inherits salt::master {
-
-  package { '$master_package_name':
-    ensure => $master_package_ensure,
-  }
+  $master_package_name   = $salt::master::master_package_name,) inherits
+salt::master {
+  package { '$master_package_name': ensure => $master_package_ensure, }
 
 }
 

manifests/master/service.pp

@@ -1,11 +1,10 @@
 class salt::master::service (
-  $master_service_name = $salt::master::master_service_name,
+  $master_service_name   = $salt::master::master_service_name,
   $master_service_ensure = $salt::master::master_service_ensure,
   $master_service_manage = $salt::master::master_service_manage,
-  $master_service_enable = $salt::master::master_service_enable,
-)inherits salt::master{
-
-  if ! ($master_service_ensure in [ 'running', 'stopped' ]) {
+  $master_service_enable = $salt::master::master_service_enable,) inherits
+salt::master {
+  if !($master_service_ensure in ['running', 'stopped']) {
     fail('service_ensure parameter must be running or stopped')
   }
 
@@ -19,5 +18,4 @@
     }
   }
 
-
 }

manifests/minion.pp

@@ -1,12 +1,13 @@
 class salt::minion (
-  $minion_config  = $salt::params::minion_config,
-  $minion_config_template  = $salt::params::minion_config_template,
-  $minion_package_ensure = $salt::params::minion_package_ensure,
-  $minion_package_name   = $salt::params::minion_package_name,
-  $minion_service_ensure = $salt::params::minion_service_ensure,
-  $minion_service_enable = $salt::params::minion_service_enable,
-  $minion_service_manage = $salt::params::minion_service_manage,
-  $minion_service_name = $salt::params::minion_service_name,) inherits salt::params {
+  $minion_config          = $salt::params::minion_config,
+  $minion_config_template = $salt::params::minion_config_template,
+  $minion_package_ensure  = $salt::params::minion_package_ensure,
+  $minion_package_name    = $salt::params::minion_package_name,
+  $minion_service_ensure  = $salt::params::minion_service_ensure,
+  $minion_service_enable  = $salt::params::minion_service_enable,
+  $minion_service_manage  = $salt::params::minion_service_manage,
+  $minion_service_name    = $salt::params::minion_service_name,) inherits
+salt::params {
   include 'salt::minion::install'
   include 'salt::minion::config'
   include 'salt::minion::service'

manifests/minion/config.pp

@@ -1,17 +1,15 @@
 class salt::minion::config (
-  $minion_config = $salt::minion::minion_config,
-  $minion_template = $salt::minion::minion_config_template,
-)inherits salt::minion{
-
+  $minion_config   = $salt::minion::minion_config,
+  $minion_template = $salt::minion::minion_config_template,) inherits
+salt::minion {
   file { $minion_config:
-    ensure => file,
-    owner => 0,
-    group => 0,
-    mode  => '0664',
+    ensure  => file,
+    owner   => 0,
+    group   => 0,
+    mode    => '0664',
     content => template($minion_template),
     replace => false,
   }
 
-# todo parameterize configuration files
-
+  # todo parameterize configuration files
 }

manifests/minion/install.pp

@@ -1,11 +1,8 @@
 class salt::minion::install (
   $minion_package_ensure = $salt::minion::minion_package_ensure,
-  $minion_package_name   = $salt::minion::minion_package_name,
-) inherits salt::minion {
-
-  package { '$minion_package_name':
-    ensure => $minion_package_ensure,
-  }
+  $minion_package_name   = $salt::minion::minion_package_name,) inherits
+salt::minion {
+  package { '$minion_package_name': ensure => $minion_package_ensure, }
 
 }
 

manifests/minion/service.pp

@@ -1,11 +1,10 @@
 class salt::minion::service (
-  $minion_service_name = $salt::minion::minion_service_name,
+  $minion_service_name   = $salt::minion::minion_service_name,
   $minion_service_ensure = $salt::minion::minion_service_ensure,
   $minion_service_manage = $salt::minion::minion_service_manage,
-  $minion_service_enable = $salt::minion::minion_service_enable,
-)inherits salt::minion{
-
-  if ! ($minion_service_ensure in [ 'running', 'stopped' ]) {
+  $minion_service_enable = $salt::minion::minion_service_enable,) inherits
+salt::minion {
+  if !($minion_service_ensure in ['running', 'stopped']) {
     fail('service_ensure parameter must be running or stopped')
   }
 
@@ -19,5 +18,4 @@
     }
   }
 
-
 }

manifests/params.pp

@@ -8,7 +8,6 @@
   $minion_service_manage = true
   $minion_service_enable = true
 
-
   $master_config = '/etc/salt/master'
   $master_config_template = 'salt/master.erb'
   $master_package_name = 'salt-master'