diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 3ee714f461..6c3b9e15eb 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -71,8 +71,6 @@
 #
 class gerrit(
   $war = '',
-  $mysql_password = '',
-  $mysql_root_password = '',
   $email_private_key = '',
   $vhost_name = $::fqdn,
   $canonicalweburl = "https://${::fqdn}/",
@@ -261,29 +259,6 @@ class gerrit(
     require => File['/home/gerrit2/review_site/etc'],
   }
 
-  # Set up MySQL.
-
-  class { 'mysql::server':
-    config_hash => {
-      'root_password'  => $mysql_root_password,
-      'default_engine' => 'InnoDB',
-      'bind_address'   => '127.0.0.1',
-    }
-  }
-  include mysql::server::account_security
-
-  mysql::db { 'reviewdb':
-    user     => 'gerrit2',
-    password => $mysql_password,
-    host     => 'localhost',
-    grant    => ['all'],
-    charset  => 'latin1',
-    require  => [
-      Class['mysql::server'],
-      Class['mysql::server::account_security'],
-    ],
-  }
-
   # Set up apache.
 
   apache::vhost { $vhost_name:
diff --git a/modules/gerrit/manifests/mysql.pp b/modules/gerrit/manifests/mysql.pp
new file mode 100644
index 0000000000..cc834d9b05
--- /dev/null
+++ b/modules/gerrit/manifests/mysql.pp
@@ -0,0 +1,32 @@
+# == Class: gerrit::mysql
+#
+class gerrit::mysql(
+  $mysql_root_password = '',
+  $database_name = '',
+  $database_user = '',
+  $database_password = '',
+) {
+
+  class { 'mysql::server':
+    config_hash => {
+      'root_password'  => $mysql_root_password,
+      'default_engine' => 'InnoDB',
+      'bind_address'   => '127.0.0.1',
+    }
+  }
+  include mysql::server::account_security
+
+  mysql::db { $database_name:
+    user     => $database_user,
+    password => $database_password,
+    host     => 'localhost',
+    grant    => ['all'],
+    charset  => 'latin1',
+    require  => [
+      Class['mysql::server'],
+      Class['mysql::server::account_security'],
+    ],
+  }
+}
+
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 8f0e10eed4..4dc5a52597 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -45,8 +45,6 @@ class openstack_project::gerrit (
   $github_oauth_token = '',
   $github_project_username = '',
   $github_project_password = '',
-  $mysql_password = '',
-  $mysql_root_password = '',
   $trivial_rebase_role_id = '',
   $email_private_key = '',
   $replicate_local = true,
@@ -155,8 +153,6 @@ class openstack_project::gerrit (
     contactstore_appsec             => $contactstore_appsec,
     contactstore_pubkey             => $contactstore_pubkey,
     contactstore_url                => $contactstore_url,
-    mysql_password                  => $mysql_password,
-    mysql_root_password             => $mysql_root_password,
     email_private_key               => $email_private_key,
     replicate_local                 => $replicate_local,
     replication                     => $replication,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 166f565046..b9e8014ae3 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -68,6 +68,15 @@ class openstack_project::review (
   $swift_username = '',
   $swift_password = ''
 ) {
+
+  # Setup MySQL
+  class { 'gerrit::mysql':
+    mysql_root_password  => $mysql_root_password,
+    database_name        => 'reviewdb',
+    database_user        => 'gerrit2',
+    database_password    => $mysql_password,
+  }
+
   class { 'openstack_project::gerrit':
     ssl_cert_file                   =>
       '/etc/ssl/certs/review.openstack.org.pem',
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index e72dd72ba2..ab4fef8a08 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -22,6 +22,15 @@ class openstack_project::review_dev (
   $swift_username = '',
   $swift_password = ''
 ) {
+
+  # Setup MySQL
+  class { 'gerrit::mysql':
+    mysql_root_password  => $mysql_root_password,
+    database_name        => 'reviewdb',
+    database_user        => 'gerrit2',
+    database_password    => $mysql_password,
+  }
+
   class { 'openstack_project::gerrit':
     vhost_name                      => 'review-dev.openstack.org',
     canonicalweburl                 => 'https://review-dev.openstack.org/',
@@ -51,8 +60,6 @@ class openstack_project::review_dev (
     github_oauth_token              => $github_oauth_token,
     github_project_username         => $github_project_username,
     github_project_password         => $github_project_password,
-    mysql_password                  => $mysql_password,
-    mysql_root_password             => $mysql_root_password,
     trivial_rebase_role_id          =>
       'trivial-rebase@review-dev.openstack.org',
     email_private_key               => $email_private_key,