Lint and syntax fixes

Ben Fairless · Ben Fairless · commit d5e63e3a9b14 · 2015-04-22T22:38:23.000+01:00
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -46,36 +46,46 @@
 #   }
 #
 class puppet::agent(
-  $puppet_agent_service   = $::puppet::params::puppet_agent_service,
-  $puppet_agent_package   = $::puppet::params::puppet_agent_package,
-  $version                = 'present',
-  $puppet_run_style       = 'service',
-  $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
-  $user_id                = undef,
-  $group_id               = undef,
+  $puppet_agent_service  = $::puppet::params::puppet_agent_service,
+  $puppet_agent_package  = $::puppet::params::puppet_agent_package,
+  $version               = 'present',
+  $puppet_run_style      = 'service',
+  $puppet_run_command    = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
+  $user_id               = undef,
+  $group_id              = undef,
+  $serialization_format  = undef,
+  $serialization_package = undef,
 
   #[main]
-  $templatedir            = undef,
-  $syslogfacility         = undef,
-  $priority               = undef,
+  $templatedir           = undef,
+  $syslogfacility        = undef,
+  $priority              = undef,
 
   #[agent]
-  $srv_domain             = undef,
-  $ordering               = undef,
-  $trusted_node_data      = undef,
-  $environment            = 'production',
-  $puppet_server          = $::puppet::params::puppet_server,
-  $use_srv_records        = false,
-  $puppet_run_interval    = 30,
-  $splay                  = false,
-  $puppet_server_port     = $::puppet::params::puppet_server_port,
-  $report                 = true,
-  $pluginsync             = true,
-  $listen                 = false,
-  $reportserver           = '$server',
-  $digest_algorithm       = $::puppet::params::digest_algorithm,
-  $configtimeout          = '2m',
-  $stringify_facts        = undef,
+  $srv_domain            = undef,
+  $ordering              = undef,
+  $trusted_node_data     = undef,
+  $environment           = 'production',
+  $puppet_server         = $::puppet::params::puppet_server,
+  $use_srv_records       = false,
+  $puppet_run_interval   = 30,
+  $splay                 = false,
+  $puppet_server_port    = $::puppet::params::puppet_server_port,
+  $report                = true,
+  $pluginsync            = true,
+  $listen                = false,
+  $reportserver          = '$server',
+  $digest_algorithm      = $::puppet::params::digest_algorithm,
+  $configtimeout         = '2m',
+  $stringify_facts       = undef,
+  $verbose               = undef,
+  $agent_noop            = undef,
+  $usecacheonfailure     = undef,
+  $certname              = undef,
+  $http_proxy_host       = undef,
+  $http_proxy_port       = undef,
+  $cron_hour             = '*',
+  $cron_minute           = undef,
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -329,26 +339,29 @@
       if $serialization_format == 'msgpack' {
         unless defined(Package[$::puppet::params::ruby_dev]) {
           package {$::puppet::params::ruby_dev:
-            ensure  => 'latest',
+            ensure => 'latest',
           }
         }
         unless defined(Package['gcc']) {
           package {'gcc':
-            ensure  => 'latest',
+            ensure => 'latest',
           }
         }
         unless defined(Package['msgpack']) {
           package {'msgpack':
-            ensure    => 'latest',
-            provider  => 'gem',
-            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+            ensure   => 'latest',
+            provider => 'gem',
+            require  => Package[$::puppet::params::ruby_dev, 'gcc'],
           }
         }
       }
     }
     ini_setting {'puppetagentserializationformatagent':
       setting => 'preferred_serialization_format',
       value   => $serialization_format,
+    }
+  }
+
   if $verbose != undef {
     ini_setting {'puppetagentverbose':
       ensure  => present,
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -2,7 +2,6 @@
 #
 # This class installs and configures a Puppet master
 #
-<<<<<<< HEAD
 # Parameters:
 # ['user_id']                   - The userid of the puppet user
 # ['group_id']                  - The groupid of the puppet group
@@ -46,8 +45,6 @@
 #  ['serialization_format']     - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
 #  ['strict_variables']         - Makes the parser raise errors when referencing unknown variables
 #  ['always_cache_features']    - if false (default), always try to load a feature even if a previous load failed
-
->>>>>>> 9f614250618d124231791e9dbee41ecca22581e7
 #
 # Requires:
 #
@@ -154,35 +151,35 @@
     nginx: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::unicorn':
-        certname                => $certname,
-        puppet_conf             => $puppet_conf,
-        puppet_ssldir           => $puppet_ssldir,
-        dns_alt_names           => $dns_alt_names,
-        listen_address          => $listen_address,
-        puppet_proxy_port       => $puppet_proxy_port,
-        disable_ssl             => $disable_ssl,
-        backup_upstream         => $backup_upstream,
-        unicorn_package         => $unicorn_package,
-        unicorn_path            => $unicorn_path,
-        disable_master          => $disable_master,
-        upstream                => $upstream,
-        backend_process_number  => $backend_process_number,
+        certname               => $certname,
+        puppet_conf            => $puppet_conf,
+        puppet_ssldir          => $puppet_ssldir,
+        dns_alt_names          => $dns_alt_names,
+        listen_address         => $listen_address,
+        puppet_proxy_port      => $puppet_proxy_port,
+        disable_ssl            => $disable_ssl,
+        backup_upstream        => $backup_upstream,
+        unicorn_package        => $unicorn_package,
+        unicorn_path           => $unicorn_path,
+        disable_master         => $disable_master,
+        upstream               => $upstream,
+        backend_process_number => $backend_process_number,
       } ->
       Anchor['puppet::master::end']
     }
     default: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::passenger':
-      puppet_proxy_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,
+      puppet_proxy_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,
       config_addon             => $puppet_passenger_cfg_addon,
       } ->
       Anchor['puppet::master::end']
@@ -229,11 +226,11 @@
   }
 
   file { $puppet_vardir:
-    ensure       => directory,
-    owner        => $::puppet::params::puppet_user,
-    group        => $::puppet::params::puppet_group,
-    notify       => Service[$webserver],
-    require      => Package[$puppet_master_package]
+    ensure  => directory,
+    owner   => $::puppet::params::puppet_user,
+    group   => $::puppet::params::puppet_group,
+    notify  => Service[$webserver],
+    require => Package[$puppet_master_package]
   }
 
   if $storeconfigs {
@@ -393,9 +390,9 @@
         }
         unless defined(Package['msgpack']) {
           package {'msgpack':
-            ensure    => latest,
-            provider  => gem,
-            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+            ensure   => latest,
+            provider => gem,
+            require  => Package[$::puppet::params::ruby_dev, 'gcc'],
           }
         }
       }
@@ -404,6 +401,7 @@
       setting => 'preferred_serialization_format',
       value   => $serialization_format,
     }
+  }
 
   validate_bool(str2bool($always_cache_features))
   ini_setting { 'puppetmasteralwayscachefeatures':
diff --git a/manifests/passenger.pp b/manifests/passenger.pp
@@ -101,7 +101,7 @@
   }
 
   apache::vhost { "puppet-${certname}":
-    port              => $puppet_proxy_port,
+    port                 => $puppet_proxy_port,
     priority             => '40',
     docroot              => $puppet_docroot,
     serveradmin          => $apache_serveradmin,
diff --git a/manifests/unicorn.pp b/manifests/unicorn.pp
@@ -44,10 +44,10 @@
   $disable_master,
   $upstream,
   $backend_process_number,
-) inherits puppet::params {  
+) inherits puppet::params {
   class { '::nginx':
-    worker_processes  => $::processorcount,
-    multi_accept      => 'on',
+    worker_processes => $::processorcount,
+    multi_accept     => 'on',
   }
   # if this is provided we install the package from the repo, otherwise we build unicorn from scratch
   if $unicorn_package {
@@ -67,18 +67,18 @@
       }
     }
     package {['unicorn', 'rack']:
-      ensure    => latest,
-      provider  => gem,
-      require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+      ensure   => latest,
+      provider => gem,
+      require  => Package[$::puppet::params::ruby_dev, 'gcc'],
     }
   }
   file {'unicorn-conf':
     path    => '/etc/puppet/unicorn.conf',
     content => template('puppet/unicorn.conf'),
   } ->
   file {'copy-config':
-    path    => '/etc/puppet/config.ru',
-    source  => '/usr/share/puppet/ext/rack/config.ru',
+    path   => '/etc/puppet/config.ru',
+    source => '/usr/share/puppet/ext/rack/config.ru',
   } ->
 
   file {'unicorn-service':
@@ -93,8 +93,8 @@
   }
   unless defined(Service['unicorn-puppetmaster']) {
     service{'unicorn-puppetmaster':
-      ensure  => running,
-      enable  => true,
+      ensure => running,
+      enable => true,
     }
   }
   # update SELinux
@@ -113,7 +113,7 @@
   $crt_clean_cmd  = "puppet cert clean ${certname}"
   # I would have preferred to use puppet cert generate, but it does not
   # return the correct 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}"
@@ -135,10 +135,10 @@
     content => template('puppet/puppetmaster'),
   } ->
   file {'enable-puppetmaster-vhost':
-    ensure  => link,
-    path    => '/etc/nginx/sites-enabled/puppetmaster',
-    target  => '/etc/nginx/sites-available/puppetmaster',
-    notify  => Service['nginx'],
+    ensure => link,
+    path   => '/etc/nginx/sites-enabled/puppetmaster',
+    target => '/etc/nginx/sites-available/puppetmaster',
+    notify => Service['nginx'],
   }
   unless defined(Service['nginx']) {
     service{'nginx':
@@ -148,4 +148,3 @@
     }
   }
 }
-
diff --git a/tests/dbterminus.pp b/tests/dbterminus.pp
@@ -1,6 +1,6 @@
  class {'puppet::dbterminus':
   puppet_confdir => '/etc/puppet/puppet.conf',
   puppet_service => Service['httpd'],
-  dbport => '8081',
-  dbserver => 'test.example.com'
+  dbport         => '8081',
+  dbserver       => 'test.example.com'
   }
diff --git a/tests/passenger.pp b/tests/passenger.pp
@@ -1,9 +1,9 @@
 class{ 'puppet::passenger':
-  puppet_proxy_port => '8140',
-  puppet_docroot => '/etc/puppet/doc',
+  puppet_proxy_port  => '8140',
+  puppet_docroot     => '/etc/puppet/doc',
   apache_serveradmin => 'me@example.com',
-  puppet_site => 'master.example.com',
-  puppet_conf => '/etc/puppet/puppet.conf',
-  puppet_ssldir => '/var/lib/puppet/ssl',
-  certname => 'master.example.com',
+  puppet_site        => 'master.example.com',
+  puppet_conf        => '/etc/puppet/puppet.conf',
+  puppet_ssldir      => '/var/lib/puppet/ssl',
+  certname           => 'master.example.com',
 }
diff --git a/tests/storedconfigs.pp b/tests/storedconfigs.pp
@@ -1,6 +1,6 @@
 class {'puppet::storeconfigs':
-  dbserver => 'test.example.com',
-  dbport => '8081',
-  puppet_service => Service['httpd'],
+  dbserver         => 'test.example.com',
+  dbport           => '8081',
+  puppet_service   => Service['httpd'],
   puppetdb_version => 'present'
 }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`apache::vhost { "puppet-${certname}":`
`104`		`- port => $puppet_proxy_port,`
	`104`	`+ port => $puppet_proxy_port,`
`105`	`105`	`priority => '40',`
`106`	`106`	`docroot => $puppet_docroot,`
`107`	`107`	`serveradmin => $apache_serveradmin,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`class {'puppet::dbterminus':`
`2`	`2`	`puppet_confdir => '/etc/puppet/puppet.conf',`
`3`	`3`	`puppet_service => Service['httpd'],`
`4`		`- dbport => '8081',`
`5`		`- dbserver => 'test.example.com'`
	`4`	`+ dbport => '8081',`
	`5`	`+ dbserver => 'test.example.com'`
`6`	`6`	`}`