Use 2.2 as the default mysql_module

Change-Id: Ib040a79a88830f1c2965bd6e5416983131ece9ce

.fixtures.yml

@@ -5,7 +5,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"
     "vswitch": "git://github.com/stackforge/puppet-vswitch"
   symlinks:

manifests/db/mysql.pp

@@ -2,7 +2,7 @@
 #   [*mysql_module*]
 #   (optional) The mysql puppet module version to use. Tested versions
 #   include 0.9 and 2.2
-#   Default to '0.9'
+#   Default to '2.2'
 #
 class neutron::db::mysql (
   $password,
@@ -13,7 +13,7 @@
   $charset       = 'utf8',
   $collate       = 'utf8_unicode_ci',
   $cluster_id    = 'localzone',
-  $mysql_module  = '0.9'
+  $mysql_module  = '2.2'
 ) {
 
   if ($mysql_module >= 2.2) {

manifests/db/mysql/host_access.pp

@@ -1,7 +1,7 @@
 #
 # Used to grant access to the neutron mysql DB
 #
-define neutron::db::mysql::host_access ($user, $password, $database, $mysql_module = '0.9')  {
+define neutron::db::mysql::host_access ($user, $password, $database, $mysql_module = '2.2')  {
   if ($mysql_module >= 2.2) {
     mysql_user { "${user}@${name}":
       password_hash => mysql_password($password),

manifests/server.pp

@@ -132,7 +132,7 @@
 # [*mysql_module*]
 #   (optional) Mysql puppet module version to use. Tested versions
 #   include 0.9 and 2.2
-#   Defaults to: '0.9'
+#   Defaults to: '2.2'
 #
 class neutron::server (
   $package_ensure          = 'present',
@@ -155,7 +155,7 @@
   $api_workers             = '0',
   $agent_down_time         = '75',
   $router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
-  $mysql_module            = '0.9',
+  $mysql_module            = '2.2',
   # DEPRECATED PARAMETERS
   $sql_connection          = undef,
   $connection              = undef,

spec/classes/neutron_db_mysql_spec.rb

@@ -8,7 +8,7 @@
 
   let :params do
     { :password => 'passw0rd',
-      :mysql_module => '0.9'
+      :mysql_module => '2.2'
     }
   end
   let :facts do

spec/defines/neutron_db_mysql_host_access_spec.rb

@@ -3,7 +3,7 @@
 describe 'neutron::db::mysql::host_access' do
 
   let :pre_condition do
-    'include mysql'
+    'include mysql::server'
   end
 
   let :title do
@@ -20,6 +20,6 @@
     { :osfamily => 'Debian' }
   end
 
-  it { should contain_database_user('[email protected]') }
-  it { should contain_database_grant('[email protected]/neutron') }
+  it { should contain_mysql_user('[email protected]') }
+  it { should contain_mysql_grant('[email protected]/neutron.*') }
 end