Merge "Use 2.2 as the default mysql_module"

.fixtures.yml

@@ -4,7 +4,7 @@ fixtures:
     "keystone": "git://github.com/stackforge/puppet-keystone.git"
     "mysql":
       repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
-      ref: 'origin/0.x'
+      ref: 'origin/2.2.x'
     "nova": "git://github.com/stackforge/puppet-nova.git"
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
   symlinks:

manifests/db/mysql.pp

@@ -31,7 +31,7 @@
 #  [*mysql_module*]
 #    The version of the mysql puppet module to use.
 #    Tested versions include 0.9 and 2.2
-#    Defaults to '0.9'.
+#    Defaults to '2.2'.
 #
 class heat::db::mysql(
   $password      = false,
@@ -41,7 +41,7 @@ class heat::db::mysql(
   $allowed_hosts = undef,
   $charset       = 'utf8',
   $collate       = 'utf8_unicode_ci',
-  $mysql_module  = '0.9'
+  $mysql_module  = '2.2'
 ) {
 
   validate_string($password)

manifests/init.pp

@@ -91,7 +91,7 @@
 # [*mysql_module*]
 #   (optional) The mysql puppet module version.
 #   Tested versions include 0.9 and 2.2
-#   Defaults to '0.9'
+#   Defaults to '2.2'
 #
 class heat(
   $auth_uri                    = false,
@@ -136,7 +136,7 @@ class heat(
   $database_idle_timeout       = 3600,
   $use_syslog                  = false,
   $log_facility                = 'LOG_USER',
-  $mysql_module                = '0.9',
+  $mysql_module                = '2.2',
 ) {
 
   include heat::params

spec/classes/heat_init_spec.rb

@@ -17,7 +17,7 @@ describe 'heat' do
       :database_idle_timeout => 3600,
       :auth_uri              => 'http://127.0.0.1:5000/v2.0',
       :keystone_ec2_uri      => 'http://127.0.0.1:5000/v2.0/ec2tokens',
-      :mysql_module          => '0.9'
+      :mysql_module          => '2.2'
     }
   end