Use 2.2 as the default mysql_module

Change-Id: I91c87fa0b4d5871aa936a5b4842b47f4cfee4ca8

diff --git a/.fixtures.yml b/.fixtures.yml
index 43fc9b55b1b348a7939499185d86b2761c2707f2..08b2b2d85957f0cc4cc198a50e468578c4b714ac 100644 (file)
--- a/.fixtures.yml
+++ b/.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:

diff --git a/manifests/db.pp b/manifests/db.pp
index f2f24efe63855f559fccbe629542fb30a663be55..0f17bf8885dc79e9e6f339cd7d92cb891c3a70b6 100644 (file)
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -12,12 +12,12 @@
 #  [*mysql_module*]
 #    (optional) Mysql puppet module version to use. Tested versions
 #    are 0.9 and 2.2
-#    Defaults to '0.9
+#    Defaults to '2.2'
 #
 class ceilometer::db (
   $database_connection = 'mysql://ceilometer:ceilometer@localhost/ceilometer',
   $sync_db             = true,
-  $mysql_module        = '0.9',
+  $mysql_module        = '2.2',
 ) {
 
   include ceilometer::params

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index ca7548d008668ccc8cca0794c0db48abf77a340f..728ea967122a9b849b5bd81266461146eb81636e 100644 (file)
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -29,7 +29,7 @@
 #  [*mysql_module*]
 #    (optional) Mysql module version to use. Tested versions
 #    are 0.9 and 2.2
-#    Defaults to '0.9'
+#    Defaults to '2.2'
 #
 class ceilometer::db::mysql(
   $password      = false,
@@ -39,7 +39,7 @@ class ceilometer::db::mysql(
   $allowed_hosts = undef,
   $charset       = 'utf8',
   $collate       = 'utf8_unicode_ci',
-  $mysql_module  = '0.9',
+  $mysql_module  = '2.2',
 ) {
 
   validate_string($password)

diff --git a/manifests/db/mysql/host_access.pp b/manifests/db/mysql/host_access.pp
index 9869f99499c4c128e737de877e1f32e6b4f0befc..e91a55191e8353d4f2e665e8ad156663b075ef2e 100644 (file)
--- a/manifests/db/mysql/host_access.pp
+++ b/manifests/db/mysql/host_access.pp
@@ -13,7 +13,7 @@
 #  [*database*]
 #    the database name
 #
-define ceilometer::db::mysql::host_access ($user, $password, $database, $mysql_module='0.9')  {
+define ceilometer::db::mysql::host_access ($user, $password, $database, $mysql_module='2.2')  {
   # New types for mysql module v2.0+
   if ($mysql_module >= 2.2) {
     mysql_user { "${user}@${name}":