Merge pull request #750 from puppetlabs/3.6.x

Mergeback 3.6.x

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2015-08-10 - Supported Release 3.6.0
+### Summary
+This release adds the ability to use mysql::db and `mysql_*` types against unmanaged or external mysql instances.
+
+#### Features
+- Add ability to use mysql::db WITHOUT mysql::server (ie, externally)
+- Add prescript attribute to mysql::server::backup for xtrabackup
+- Add postscript ability to xtrabackup provider.
+
+#### Bugfixes
+- Fix default root passwords blocking puppet on mysql 5.8
+- Fix service dependency when package_manage is false
+- Fix selinux permissions on my.cnf
+
 ##2015-07-23 - Supported Release 3.5.0
 ###Summary
 A small release to add explicit support to newer Puppet versions and accumulated patches.

README.md

@@ -1,10 +1,9 @@
-#MySQL
+# mysql
 
 #### Table of Contents
 
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Backwards compatibility information](#backwards-compatibility)
+1. [Module Description - What the module does and why it is useful](#module-description)
+2. [Backwards compatibility information](#backwards-compatibility)
 3. [Setup - The basics of getting started with mysql](#setup)
     * [Beginning with mysql](#beginning-with-mysql)
 4. [Usage - Configuration options and additional functionality](#usage)
@@ -12,25 +11,17 @@
     * [Creating a Database](#creating-a-database)
     * [Custom Configuration](#custom-configuration)
 5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-The MySQL module installs, configures, and manages the MySQL service.
+6. [Limitations - OS compatibility, etc.](#limitations)
+7. [Development - Guide for contributing to the module](#development)
 
 ## Module Description
 
+The MySQL module installs, configures, and manages the MySQL service.
+
 The MySQL module manages both the installation and configuration of MySQL, as well as extending Puppet to allow management of MySQL resources, such as databases, users, and grants.
 
 ## Setup
 
-###What MySQL affects
-
-* MySQL package
-* MySQL configuration files
-* MySQL service
-
 ### Beginning with MySQL
 
 If you want a server installed with the default options you can run
@@ -148,8 +139,8 @@ To add custom MySQL configuration, drop additional files into
 
 ### Working with an existing server
 
-It is possible to use the MySQL module to instantiate databases and
-users on an existing MySQL server.  For this to work, you will need an
+You can use the MySQL module to instantiate databases and
+users on an existing MySQL server. For this to work, you need an
 appropriate `.my.cnf` in `root`'s home directory containing the remote
 server address and credentials. For example:
 
@@ -158,7 +149,7 @@ server address and credentials.  For example:
     host=localhost
     password=secret
 
-When working with a remote server, you will *not* use the
+When working with a remote server, do *not* use the
 `mysql::server` class in your Puppet manifests.
 
 ## Reference
@@ -166,15 +157,16 @@ When working with a remote server, you will *not* use the
 ### Classes
 
 #### Public classes
-* `mysql::server`: Installs and configures MySQL.
-* `mysql::server::account_security`: Deletes default MySQL accounts.
-* `mysql::server::monitor`: Sets up a monitoring user.
-* `mysql::server::mysqltuner`: Installs MySQL tuner script.
-* `mysql::server::backup`: Sets up MySQL backups via cron.
-* `mysql::bindings`: Installs various MySQL language bindings.
-* `mysql::client`: Installs MySQL client (for non-servers).
+
+* [`mysql::server`](#mysqlserver): Installs and configures MySQL.
+* [`mysql::server::monitor`](#mysqlservermonitor): Sets up a monitoring user.
+* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): Installs MySQL tuner script.
+* [`mysql::server::backup`](#mysqlserverbackup): Sets up MySQL backups via cron.
+* [`mysql::bindings`](#mysqlbindings): Installs various MySQL language bindings.
+* [`mysql::client`](#mysqlclient): Installs MySQL client (for non-servers).
 
 #### Private classes
+
 * `mysql::server::install`: Installs packages.
 * `mysql::server::config`: Configures MYSQL.
 * `mysql::server::service`: Manages service.
@@ -219,7 +211,7 @@ This is required if `create_root_user` or `create_root_my_cnf` are 'true'. If `r
 
 Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. 
 
-####`old_root_password`
+##### `old_root_password`
 
 This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password.
 
@@ -416,7 +408,11 @@ An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05
 
 ##### `postscript`
 
-A script that is executed at when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files.
+A script that is executed when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files.
+
+##### `prescript`
+
+A script that is executed before the backup begins.
 
 ##### `provider`
 
@@ -591,7 +587,7 @@ Whether to manage the MySQL client package. Defaults to true.
 
 The name of the MySQL client package to install.
 
-###Defined Types
+### Defines
 
 #### mysql::db
 
@@ -652,7 +648,6 @@ Specify whether to create the database. Valid values are 'present', 'absent'. De
 
 Timeout, in seconds, for loading the sqlfiles. Defaults to '300'.
 
-
 ### Types
 
 #### mysql_database
@@ -726,7 +721,7 @@ Maximum updates per hour for the user. Must be an integer value. A value of '0'
 #### mysql_grant
 
 `mysql_grant` creates grant permissions to access databases within
-MySQL. To use it you must create the title of the resource as shown below,
+MySQL. To create grant permissions to access databases with MySQL, use it you must create the title of the resource as shown below,
 following the pattern of `username@hostname/database.table`:
 
 ~~~
@@ -819,11 +814,10 @@ This module has been tested on:
 * Ubuntu 10.04, 12.04, 14.04
 * Scientific Linux 5, 6
 * SLES 11
-* Solaris 11.2, 11.3, 12.0
 
 Testing on other platforms has been minimal and cannot be guaranteed.
 
-#Development
+## Development
 
 Puppet Labs modules on the Puppet Forge are open projects, and community
 contributions are essential for keeping them great. We can't access the

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",