Merge pull request puppetlabs#115 from frimik/restart_optional_and_mi…

…nor_doc_fix Restart optional and minor doc fix
bodepd · Sep 17, 2012 · b9e4b0a · b9e4b0a
2 parents d98efe3 + 063b8c0
commit b9e4b0a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -15,6 +15,10 @@
 #   [*ssl_ca]             - path to ssl-ca
 #   [*ssl_cert]           - path to ssl-cert
 #   [*ssl_key]            - path to ssl-key
+#   [*log_error]          - path to mysql error log
+#   [*default_engine]     - configure a default table engine
+#   [*root_group]         - use specified group for root-owned files
+#   [*restart]            - whether to restart mysqld (true/false)
 #
 # Actions:
 #
@@ -46,14 +50,18 @@
   $ssl_key           = $mysql::params::ssl_key,
   $log_error         = $mysql::params::log_error,
   $default_engine    = 'UNSET',
-  $root_group        = $mysql::params::root_group
+  $root_group        = $mysql::params::root_group,
+  $restart           = $mysql::params::restart
 ) inherits mysql::params {
 
   File {
     owner  => 'root',
     group  => $root_group,
     mode   => '0400',
-    notify => Exec['mysqld-restart'],
+    notify    => $restart ? {
+      true => Exec['mysqld-restart'],
+      false => undef,
+    },
   }
 
   if $ssl and $ssl_ca == undef {
@@ -90,7 +98,10 @@
       logoutput => true,
       unless    => "mysqladmin -u root -p'${root_password}' status > /dev/null",
       path      => '/usr/local/sbin:/usr/bin:/usr/local/bin',
-      notify    => Exec['mysqld-restart'],
+      notify    => $restart ? {
+        true => Exec['mysqld-restart'],
+        false => undef,
+      },
       require   => File['/etc/mysql/conf.d'],
     }
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -16,6 +16,7 @@
   $port                = 3306
   $etc_root_password   = false
   $ssl                 = false
+  $restart             = true
 
   case $::operatingsystem {
     'Ubuntu': {