From 3f92f797e1da5bc0056d4f56f29d850ccfc34e3e Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Thu, 24 Apr 2014 09:00:13 -0700
Subject: [PATCH] Move local git replica on review to /opt

Merge after it has been created there manually to avoid downtime.
Will require a gerrit restart to pick up the replication change.

Change-Id: I6b55d16d731725548b8da46f5438e296b6dc6485
---
 modules/gerrit/manifests/init.pp                  | 2 +-
 modules/openstack_project/manifests/gerrit.pp     | 2 +-
 modules/openstack_project/manifests/review_dev.pp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index f2cb1d51ef..257b2916fd 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -136,7 +136,7 @@ class gerrit(
   $enable_melody = false,
   $melody_session = false,
   $replicate_local = false,
-  $replicate_path = '/var/lib/git',
+  $replicate_path = '/opt/lib/git',
   $replication = [],
   $gitweb = true,
   $cgit = false,
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 1487d0fa3a..6b019d13a6 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -56,7 +56,7 @@ class openstack_project::gerrit (
   $email_private_key = '',
   $replicate_local = true,
   $replication = [],
-  $local_git_dir = '/var/lib/git',
+  $local_git_dir = '/opt/lib/git',
   $jeepyb_cache_dir = '/opt/lib/jeepyb',
   $cla_description = 'OpenStack Individual Contributor License Agreement',
   $cla_file = 'static/cla.html',
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 7fb78d7bdc..064f933eb3 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -68,7 +68,6 @@ class openstack_project::review_dev (
     web_repo_url                    => 'https://git.openstack.org/cgit/',
     swift_username                  => $swift_username,
     swift_password                  => $swift_password,
-    local_git_dir                   => '/opt/lib/git',
     replication                     => [
       {
         name                 => 'github',