Merge pull request #37 from jmchilton/mysql_improvements

Mysql improvements

manifests/db/mysql.pp

@@ -4,11 +4,12 @@
 #
 class glance::db::mysql(
   $password,
-  $dbname = 'glance',
-  $user = 'glance',
-  $host = '127.0.0.1',
+  $dbname        = 'glance',
+  $user          = 'glance',
+  $host          = '127.0.0.1',
   $allowed_hosts = undef,
-  $cluster_id = 'localzone'
+  $charset       = 'latin1',
+  $cluster_id    = 'localzone'
 ) {
 
   Class['glance::db::mysql'] -> Exec<| title == 'glance-manage db_sync' |>
@@ -20,9 +21,9 @@ class glance::db::mysql(
     user         => $user,
     password     => $password,
     host         => $host,
-    charset      => 'latin1',
+    charset      => $charset,
     # I may want to inject some sql
-    require      => Class['mysql::server'],
+    require      => Class['mysql::config'],
   }
 
   if $allowed_hosts {

spec/classes/glance_db_mysql_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe 'glance::db::mysql' do
+  let :facts do
+    {
+      :osfamily => 'Debian'
+    }
+  end  
+
+  describe "with default params" do
+    let :params do
+      { 
+      	:password => 'glancepass1' 
+      }
+    end
+
+  	it { should include_class('mysql::python') }
+
+    it { should contain_mysql__db('glance').with(
+      :password => 'glancepass1',
+      :require  => 'Class[Mysql::Config]',
+      :charset  => 'latin1'
+    )}
+
+  end
+
+  describe "overriding default params" do
+    let :params do
+      { 
+      	:password => 'glancepass2',
+      	:dbname   => 'glancedb2',
+      	:charset  => 'utf8'
+      }
+    end
+
+    it { should contain_mysql__db('glancedb2').with(
+      :password => 'glancepass2',
+      :charset  => 'utf8'
+    )}
+
+  end
+
+end