Parameterized pidfile; critical for successful first restart

manifests/config.pp

@@ -38,6 +38,7 @@
   $service_name      = $mysql::params::service_name,
   $config_file       = $mysql::params::config_file,
   $socket            = $mysql::params::socket,
+  $pidfile           = $mysql::params::pidfile,
   $datadir           = $mysql::params::datadir,
   $ssl               = $mysql::params::ssl,
   $ssl_ca            = $mysql::params::ssl_ca,

manifests/params.pp

@@ -34,6 +34,7 @@
       $client_package_name   = 'mysql'
       $server_package_name   = 'mysql-server'
       $socket                = '/var/lib/mysql/mysql.sock'
+      $pidfile               = '/var/run/mysqld/mysqld.pid'
       $config_file           = '/etc/my.cnf'
       $log_error             = '/var/log/mysqld.log'
       $ruby_package_name     = 'ruby-mysql'
@@ -53,6 +54,7 @@
       $client_package_name  = 'mysql-client'
       $server_package_name  = 'mysql-server'
       $socket               = '/var/run/mysqld/mysqld.sock'
+      $pidfile              = '/var/run/mysqld/mysqld.pid'
       $config_file          = '/etc/mysql/my.cnf'
       $log_error            = '/var/log/mysql/error.log'
       $ruby_package_name    = 'libmysql-ruby'
@@ -71,6 +73,7 @@
       $client_package_name   = 'databases/mysql55-client'
       $server_package_name   = 'databases/mysql55-server'
       $socket                = '/tmp/mysql.sock'
+      $pidfile               = '/var/db/mysql/mysql.pid'
       $config_file           = '/var/db/mysql/my.cnf'
       $log_error             = "/var/db/mysql/${::hostname}.err"
       $ruby_package_name     = 'ruby-mysql'

spec/classes/mysql_config_spec.rb

@@ -21,6 +21,7 @@
          :service_name => 'mysql',
          :config_file  => '/etc/mysql/my.cnf',
          :socket       => '/var/run/mysqld/mysqld.sock',
+         :pidfile      => '/var/run/mysqld/mysqld.pid',
          :root_group   => 'root',
          :ssl_ca       => '/etc/mysql/cacert.pem',
          :ssl_cert     => '/etc/mysql/server-cert.pem',
@@ -31,13 +32,15 @@
          :service_name => 'mysql-server',
          :config_file  => '/var/db/mysql/my.cnf',
          :socket       => '/tmp/mysql.sock',
+         :pidfile      => '/var/db/mysql/mysql.pid',
          :root_group   => 'wheel',
       },
       'Redhat' => {
          :datadir      => '/var/lib/mysql',
          :service_name => 'mysqld',
          :config_file  => '/etc/my.cnf',
          :socket       => '/var/lib/mysql/mysql.sock',
+         :pidfile      => '/var/run/mysqld/mysqld.pid',
          :root_group   => 'root',
          :ssl_ca       => '/etc/mysql/cacert.pem',
          :ssl_cert     => '/etc/mysql/server-cert.pem',
@@ -92,6 +95,7 @@
             :service_name   => 'dans_service',
             :config_file    => '/home/dan/mysql.conf',
             :service_name   => 'dans_mysql',
+            :pidfile        => '/home/dan/mysql.pid',
             :socket         => '/home/dan/mysql.sock',
             :bind_address   => '0.0.0.0',
             :port           => '3306',
@@ -153,6 +157,7 @@
               expected_lines = [
                 "port    = #{param_values[:port]}",
                 "socket    = #{param_values[:socket]}",
+                "pid-file  = #{param_values[:pidfile]}",
                 "datadir   = #{param_values[:datadir]}",
                 "bind-address    = #{param_values[:bind_address]}"
               ]

templates/my.cnf.erb

@@ -6,6 +6,7 @@ socket    = <%= socket %>
 nice    = 0
 [mysqld]
 user    = mysql
+pid-file  = <%= pidfile %>
 socket    = <%= socket %>
 port      = <%= port %>
 basedir   = <%= basedir %>