From 16ba76b01db3a640034545f453f8c41c82b6cbfb Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 10 Oct 2012 18:46:19 -0700
Subject: [PATCH] Fix Gerrit MySQL DB.

I hope. The grant parameter appears to want an array so give it one.
Also enforce order by requiring the mysql server and account security
settings in the DB resource.

Change-Id: I2c99c25cb09cb5b68240a5fbd146f47ba8aee410
Reviewed-on: https://review.openstack.org/14320
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/gerrit/manifests/init.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index eb21d88f13..0d606e9959 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -266,8 +266,12 @@ class gerrit($vhost_name=$fqdn,
     user     => 'gerrit2',
     password => $mysql_password,
     host     => 'localhost',
-    grant    => 'all',
+    grant    => ['all'],
     charset  => 'latin1',
+    require  => [
+      Class['mysql::server'],
+      Class['mysql::server::account_security'],
+    ],
   }
 
   # Set up apache.