diff --git a/modules/lodgeit/manifests/site.pp b/modules/lodgeit/manifests/site.pp
index ce00edd41e..031551f9e3 100644
--- a/modules/lodgeit/manifests/site.pp
+++ b/modules/lodgeit/manifests/site.pp
@@ -50,6 +50,7 @@ define lodgeit::site($port, $image="") {
   exec { "create_database_${name}":
     command => "drizzle --user=root -e \"create database if not exists ${name};\"",
     path => "/bin:/usr/bin",
+    unless => "drizzle --disable-column-names -r --batch -e \"show databases like 'openstack'\" | grep openstack >/dev/null",
     require => Service["drizzle"]
   }