From 4e689e4b864f4869a9e9ae7dac9468a893d09d3f Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 5 Aug 2016 15:54:15 +0000
Subject: [PATCH] Ensure git cronjob absent for correct user

When removing a cron resource by setting it absent, it must continue
to specify the user if it wasn't root (the default) since crontabs
are per-user files.

Change-Id: I34f45bf186ed1739b74c70a2bec444aed83ee8d5
---
 modules/openstack_project/manifests/gerrit.pp      | 1 +
 modules/openstack_project/manifests/git_backend.pp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index fb9a2c7286..953c97cfe3 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -397,6 +397,7 @@ class openstack_project::gerrit (
         }
         cron { 'mirror_repack':
           ensure      => absent,
+          user        => 'gerrit2',
         }
         cron { 'mirror_gitgc':
           user        => 'gerrit2',
diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp
index 8cf1a13f3d..c9f2cb8291 100644
--- a/modules/openstack_project/manifests/git_backend.pp
+++ b/modules/openstack_project/manifests/git_backend.pp
@@ -119,6 +119,7 @@ class openstack_project::git_backend (
 
   cron { 'mirror_repack':
     ensure      => absent,
+    user        => 'cgit',
   }
 
   cron { 'mirror_gitgc':