Cleanup some lint items

Author: Stephen

manifests/agent.pp

@@ -239,9 +239,9 @@
   }
 
   ini_setting {'puppetagentmaster':
-    ensure   => present,
-    setting  => 'server',
-    value    => $puppet_server,
+    ensure  => present,
+    setting => 'server',
+    value   => $puppet_server,
   }
 
   ini_setting {'puppetagentuse_srv_records':

manifests/master.pp

@@ -124,23 +124,23 @@
 
   Anchor['puppet::master::begin'] ->
   class {'puppet::passenger':
-    puppet_passenger_port => $puppet_passenger_port,
-    puppet_docroot        => $puppet_docroot,
-    apache_serveradmin    => $apache_serveradmin,
-    puppet_conf           => $::puppet::params::puppet_conf,
-    puppet_ssldir         => $puppet_ssldir,
-    certname              => $certname,
-    conf_dir              => $::puppet::params::confdir,
-    dns_alt_names         => join($dns_alt_names,','),
-    generate_ssl_certs    => $generate_ssl_certs,
+    puppet_passenger_port    => $puppet_passenger_port,
+    puppet_docroot           => $puppet_docroot,
+    apache_serveradmin       => $apache_serveradmin,
+    puppet_conf              => $::puppet::params::puppet_conf,
+    puppet_ssldir            => $puppet_ssldir,
+    certname                 => $certname,
+    conf_dir                 => $::puppet::params::confdir,
+    dns_alt_names            => join($dns_alt_names,','),
+    generate_ssl_certs       => $generate_ssl_certs,
     puppet_passenger_tempdir => $puppet_passenger_tempdir,
   } ->
   Anchor['puppet::master::end']
 
   service { $puppet_master_service:
-    ensure    => stopped,
-    enable    => false,
-    require   => File[$::puppet::params::puppet_conf],
+    ensure  => stopped,
+    enable  => false,
+    require => File[$::puppet::params::puppet_conf],
   }
 
   if ! defined(File[$::puppet::params::puppet_conf]){
@@ -177,11 +177,11 @@
   }
 
   file { $puppet_vardir:
-    ensure       => directory,
-    owner        => $::puppet::params::puppet_user,
-    group        => $::puppet::params::puppet_group,
-    notify       => Service['httpd'],
-    require      => Package[$puppet_master_package]
+    ensure  => directory,
+    owner   => $::puppet::params::puppet_user,
+    group   => $::puppet::params::puppet_group,
+    notify  => Service['httpd'],
+    require => Package[$puppet_master_package]
   }
 
   if $storeconfigs {

manifests/passenger.pp

@@ -75,7 +75,7 @@
     $crt_clean_cmd  = "puppet cert clean ${certname}"
     # I would have preferred to use puppet cert generate, but it does not
     # return the corret exit code on some versions of puppet
-    $crt_gen_cmd   = "puppet certificate --ca-location=local --dns_alt_names=$dns_alt_names generate ${certname}"
+    $crt_gen_cmd   = "puppet certificate --ca-location=local --dns_alt_names=${dns_alt_names} generate ${certname}"
     # I am using the sign command here b/c AFAICT, the sign command for certificate
     # does not work
     $crt_sign_cmd  = "puppet cert sign --allow-dns-alt-names ${certname}"