Merge branch 'release/1.0.8'

Author: vStone

lib/facter/mysql_facts.rb

@@ -40,7 +40,7 @@ def create_mysqld_fact_mysqldhelp(factname, varname)
     confine :kernel => :linux
     setcode do
       if @the_config_settings == nil
-        @the_config_settings = %x{/usr/sbin/mysqld --help --verbose --log-bin=/dev/null 2>/dev/null}
+        @the_config_settings = %x{/usr/sbin/mysqld --help --verbose --pid-file=/tmp/facter-mysqld-dummy.pid --log-bin=/dev/null 2>/dev/null}
       end
       re = Regexp.new("^#{varname}\\s+([^ ]+)$")
       if @the_config_settings.match re
@@ -126,7 +126,8 @@ def create_mysqld_fact_augeas(factname, varname, default, section='mysqld')
 
 if File.exists?('/usr/sbin/mysqld')
   create_mysqld_fact_mysqldhelp('mysqld_tmpdir', 'tmpdir')
-  create_mysqld_fact_mysqldhelp('mysqld_pidfile', 'pid-file')
+  # This fact has been removed due to issue #3. It does not provide correct information
+  # create_mysqld_fact_mysqldhelp('mysqld_pidfile', 'pid-file')
   create_mysqld_fact_mysqldhelp('mysqld_socket', 'socket')
   create_mysqld_fact_mysqldhelp('mysqld_server_id', 'server-id')
   create_mysqld_fact_mysqldhelp('mysqld_ssl', 'ssl')

manifests/config/server.pp

@@ -129,13 +129,6 @@
       ensure => 'directory',
       mode   => $config_dir_mode,
     }
-    # Little trick, if the include folder is a subfolder of config_dir, we will
-    # add a dependency on it :)
-    if regsubst($config_includedir, "^${config_dir}", '__MATCH__')  =~ /^__MATCH__/ {
-      File[$config_includedir] {
-        require => File[$config_dir],
-      }
-    }
   }
 
   file { $logdir :

manifests/module.pp

@@ -0,0 +1,10 @@
+# == Class: percona::module
+#
+# Stores module information
+#
+class percona::module {
+
+  $id = 'unifiedpost-puppet-percona'
+  $version = '1.0.8'
+
+}

templates/my.cnf.erb

@@ -4,7 +4,6 @@
 ### Template source:  'MODULES<%= template_source.gsub(Regexp.new("^#{Puppet::Node::Environment.current[:modulepath].gsub(':','|')}"),"") %>'
 <%= scope.function_percona_hash_print([options]) %>
 
-
-<% if defined?(config_includer) and config_includer != :undef -%>
-!includedir <%= config_includer %>
+<% if defined?(@config_includedir) and @config_includedir != :undef -%>
+!includedir <%= @config_includedir %>
 <% end -%>