Fix lint warnings

puppetlabs · Sep 4, 2012 · b670071 · b670071
1 parent 0e4de09
commit b670071
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -17,8 +17,8 @@
 ) inherits mysql::params {
 
   package { 'mysql_client':
-    name    => $package_name,
-    ensure  => $package_ensure,
+    ensure => $package_ensure,
+    name   => $package_name,
   }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -18,7 +18,7 @@
   $ssl                 = false
 
   case $::operatingsystem {
-    "Ubuntu": {
+    'Ubuntu': {
       $service_provider = upstart
     }
     default: {

diff --git a/manifests/python.pp b/manifests/python.pp
@@ -19,8 +19,8 @@
 ) inherits mysql::params {
 
   package { 'python-mysqldb':
-    name   => $package_name,
     ensure => $package_ensure,
+    name   => $package_name,
   }
 
 }
diff --git a/manifests/ruby.pp b/manifests/ruby.pp
@@ -20,8 +20,8 @@
 ) inherits mysql::params {
 
   package{ 'ruby_mysql':
-    name     => $package_name,
     ensure   => $package_ensure,
+    name     => $package_name,
     provider => $package_provider,
   }
 

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -31,8 +31,8 @@
   create_resources( 'class', $config_class )
 
   package { 'mysql-server':
-    name   => $package_name,
     ensure => $package_ensure,
+    name   => $package_name,
   }
 
   if $enabled {
@@ -42,8 +42,8 @@
   }
 
   service { 'mysqld':
-    name     => $service_name,
     ensure   => $service_ensure,
+    name     => $service_name,
     enable   => $enabled,
     require  => Package['mysql-server'],
     provider => $service_provider,

diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -87,8 +87,7 @@
 ) {
   include mysql::config
 
-  # XXX would be nicer to use the is_hash function from stdlib
-  if inline_template('<%= settings.is_a?(Hash) ? "true" : "false" %>') == 'true' {
+  if is_hash($settings) {
     $content = template('mysql/my.conf.cnf.erb')
   } else {
     $content = $settings

diff --git a/manifests/server/monitor.pp b/manifests/server/monitor.pp
@@ -7,8 +7,8 @@
   Class['mysql::server'] -> Class['mysql::server::monitor']
 
   database_user{ "${mysql_monitor_username}@${mysql_monitor_hostname}":
-    password_hash => mysql_password($mysql_monitor_password),
     ensure        => present,
+    password_hash => mysql_password($mysql_monitor_password),
   }
 
   database_grant { "${mysql_monitor_username}@${mysql_monitor_hostname}":

diff --git a/tests/server/config.pp b/tests/server/config.pp
@@ -2,7 +2,7 @@
   settings => {
     'mysqld' => {
       'bind-address' => '0.0.0.0',
-      'read-only' => true,
+      'read-only'    => true,
     },
     'client' => {
       'port' => '3306'