From 3a6437a21bceff72a5daf4ed775378177a44f323 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 10 Oct 2012 18:01:29 -0700
Subject: [PATCH] Ensure destination dir for bcpg link is present.

The destination dir for the bcpg link needs to be present before the
link can be made. Add that dir to the gerrit init manifest and require
it in the link file resource.

Change-Id: I462cc96dcd0eafa814e3e3599a96eacc64665bcf
Reviewed-on: https://review.openstack.org/14319
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/gerrit/manifests/init.pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 1a979e25b1..eb21d88f13 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -178,6 +178,12 @@ class gerrit($vhost_name=$fqdn,
     require => File['/home/gerrit2/review_site'],
   }
 
+  file { '/home/gerrit2/review_site/lib':
+    ensure  => directory,
+    owner   => 'gerrit2',
+    require => File['/home/gerrit2/review_site'],
+  }
+
   # Skip replication if we're in test mode
   if ($testmode == false) {
     file { '/home/gerrit2/review_site/etc/replication.config':
@@ -446,7 +452,10 @@ class gerrit($vhost_name=$fqdn,
     file { '/home/gerrit2/review_site/lib/bcpg.jar':
       ensure  => link,
       target  => '/usr/share/java/bcpg.jar',
-      require => Package['libbcpg-java'],
+      require => [
+        Package['libbcpg-java'],
+        File['/home/gerrit2/review_site/lib'],
+      ],
     }
     file { '/home/gerrit2/review_site/etc/contact_information.pub':
       ensure  => present,