From 33f0963048fd6e0c979d5f0af8e4d72d866516da Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Wed, 6 Jun 2012 10:06:46 -0700
Subject: [PATCH] Fix gerrit group permissions.

review.openstack.org will restart on every puppet run otherwise.

Change-Id: I999f279dec016f201390d47ab6f2ca3d412c86eb
---
 modules/gerrit/manifests/init.pp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index bbddd3920e..6ec503fe49 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -310,16 +310,6 @@ class gerrit($virtual_hostname='',
     require => File["/home/gerrit2/review_site/etc"]
   }
 
-  file { '/home/gerrit2/review_site/etc/gerrit.config.puppet':
-    owner => 'gerrit2',
-    group => 'gerrit2',
-    mode => 644,
-    ensure => 'present',
-    content => template('gerrit/gerrit.config.erb'),
-    replace => 'true',
-    require => File["/home/gerrit2/review_site/etc"]
-  }
-
   file { '/home/gerrit2/review_site/hooks/change-merged':
     owner => 'root',
     group => 'root',
@@ -517,9 +507,10 @@ class gerrit($virtual_hostname='',
     require => Exec["download:$war"],
     ensure => present,
     replace => 'true',
-    # user, and mode have to be set this way to avoid retriggering gerrit-init on every run
+    # user, group, and mode have to be set this way to avoid retriggering gerrit-init on every run
     # because gerrit init sets them this way
     owner => 'gerrit2',
+    group => 'gerrit2',
     mode => 644,
   }