From cbd1a0d43f8de038277c21fd89e29aaa4f37465c Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 16 May 2012 10:00:13 -0500
Subject: [PATCH] Change require => mysql::server to mysql::config so the mysql
 is fully configured before glance database is created.

---
 manifests/db/mysql.pp                |  2 +-
 spec/classes/glance_db_mysql_spec.rb | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 3a062986..9fe6b9f8 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -22,7 +22,7 @@ class glance::db::mysql(
     host         => $host,
     charset      => 'latin1',
     # I may want to inject some sql
-    require      => Class['mysql::server'],
+    require      => Class['mysql::config'],
   }
 
   if $allowed_hosts {
diff --git a/spec/classes/glance_db_mysql_spec.rb b/spec/classes/glance_db_mysql_spec.rb
index 7880079f..a124e775 100644
--- a/spec/classes/glance_db_mysql_spec.rb
+++ b/spec/classes/glance_db_mysql_spec.rb
@@ -5,8 +5,8 @@ describe 'glance::db::mysql' do
     {
       :osfamily => 'Debian'
     }
-  end
-  
+  end  
+
   describe "with default params" do
     let :params do
       { 
@@ -15,5 +15,12 @@ describe 'glance::db::mysql' do
     end
 
   	it { should include_class('mysql::python') }
+
+    it { should contain_mysql__db('glance').with(
+      :password => 'glancepass1',
+      :require  => 'Class[Mysql::Config]'
+    )}
+
   end
+
 end