opendev/system-config
Code Issues Proposed changes

Merge "Disable Gerrit auto-abandon"

Browse Source
This commit is contained in:
Jenkins 2014-06-01 04:01:10 +00:00 committed by Gerrit Code Review
commit 5913be5155
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gerrit/manifests/cron.pp
View File

@ -1,17 +1,6 @@
# == Class: gerrit::cron
#
class gerrit::cron(
$script_user = 'update',
$script_key_file = '/home/gerrit2/.ssh/id_rsa'
) {
cron { 'expireoldreviews':
user => 'gerrit2',
hour => '6',
minute => '3',
command => "python /usr/local/bin/expire-old-reviews ${script_user} ${script_key_file}",
require => Class['jeepyb'],
}
class gerrit::cron {
cron { 'gerrit_repack':
user => 'gerrit2',
@ -22,6 +11,11 @@ class gerrit::cron(
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
}
cron { 'expireoldreviews':
ensure => 'absent',
user => 'gerrit2',
}
cron { 'removedbdumps':
ensure => 'absent',
user => 'gerrit2',

8
modules/openstack_project/manifests/gerrit.pp
View File

@ -43,9 +43,6 @@ class openstack_project::gerrit (
$contactstore_appsec = '',
$contactstore_pubkey = '',
$contactstore_url = '',
$script_user = 'update',
$script_key_file = '/home/gerrit2/.ssh/id_rsa',
$script_logging_conf = '/home/gerrit2/.sync_logging.conf',
$projects_file = 'UNDEF',
$projects_config = 'UNDEF',
$github_username = '',
@ -200,10 +197,7 @@ class openstack_project::gerrit (
}
if ($testmode == false) {
class { 'gerrit::cron':
script_user => $script_user,
script_key_file => $script_key_file,
}
include gerrit::cron
class { 'github':
username => $github_username,
project_username => $github_project_username,

3
modules/openstack_project/manifests/review.pp
View File

@ -114,9 +114,6 @@ class openstack_project::review (
contactstore_pubkey => $contactstore_pubkey,
contactstore_url =>
'http://www.openstack.org/verify/member/',
script_user => 'launchpadsync',
script_key_file => '/home/gerrit2/.ssh/launchpadsync_rsa',
script_logging_conf => '/home/gerrit2/.sync_logging.conf',
projects_file =>
'puppet:///modules/openstack_project/review.projects.yaml',
projects_config =>

3
modules/openstack_project/manifests/review_dev.pp
View File

@ -48,9 +48,6 @@ class openstack_project::review_dev (
contactstore_pubkey => $contactstore_pubkey,
contactstore_url =>
'https://review-dev.openstack.org/fakestore',
script_user => 'launchpadsync',
script_key_file => '/home/gerrit2/.ssh/launchpadsync_rsa',
script_logging_conf => '/home/gerrit2/.sync_logging.conf',
projects_file =>
'puppet:///modules/openstack_project/review-dev.projects.yaml',
projects_config =>