Merge "Disable Gerrit auto-abandon"
This commit is contained in:
commit
5913be5155
@ -1,17 +1,6 @@
|
|||||||
# == Class: gerrit::cron
|
# == Class: gerrit::cron
|
||||||
#
|
#
|
||||||
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'],
|
|
||||||
}
|
|
||||||
|
|
||||||
cron { 'gerrit_repack':
|
cron { 'gerrit_repack':
|
||||||
user => 'gerrit2',
|
user => 'gerrit2',
|
||||||
@ -22,6 +11,11 @@ class gerrit::cron(
|
|||||||
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
|
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cron { 'expireoldreviews':
|
||||||
|
ensure => 'absent',
|
||||||
|
user => 'gerrit2',
|
||||||
|
}
|
||||||
|
|
||||||
cron { 'removedbdumps':
|
cron { 'removedbdumps':
|
||||||
ensure => 'absent',
|
ensure => 'absent',
|
||||||
user => 'gerrit2',
|
user => 'gerrit2',
|
||||||
|
@ -43,9 +43,6 @@ class openstack_project::gerrit (
|
|||||||
$contactstore_appsec = '',
|
$contactstore_appsec = '',
|
||||||
$contactstore_pubkey = '',
|
$contactstore_pubkey = '',
|
||||||
$contactstore_url = '',
|
$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_file = 'UNDEF',
|
||||||
$projects_config = 'UNDEF',
|
$projects_config = 'UNDEF',
|
||||||
$github_username = '',
|
$github_username = '',
|
||||||
@ -200,10 +197,7 @@ class openstack_project::gerrit (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($testmode == false) {
|
if ($testmode == false) {
|
||||||
class { 'gerrit::cron':
|
include gerrit::cron
|
||||||
script_user => $script_user,
|
|
||||||
script_key_file => $script_key_file,
|
|
||||||
}
|
|
||||||
class { 'github':
|
class { 'github':
|
||||||
username => $github_username,
|
username => $github_username,
|
||||||
project_username => $github_project_username,
|
project_username => $github_project_username,
|
||||||
|
@ -114,9 +114,6 @@ class openstack_project::review (
|
|||||||
contactstore_pubkey => $contactstore_pubkey,
|
contactstore_pubkey => $contactstore_pubkey,
|
||||||
contactstore_url =>
|
contactstore_url =>
|
||||||
'http://www.openstack.org/verify/member/',
|
'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 =>
|
projects_file =>
|
||||||
'puppet:///modules/openstack_project/review.projects.yaml',
|
'puppet:///modules/openstack_project/review.projects.yaml',
|
||||||
projects_config =>
|
projects_config =>
|
||||||
|
@ -48,9 +48,6 @@ class openstack_project::review_dev (
|
|||||||
contactstore_pubkey => $contactstore_pubkey,
|
contactstore_pubkey => $contactstore_pubkey,
|
||||||
contactstore_url =>
|
contactstore_url =>
|
||||||
'https://review-dev.openstack.org/fakestore',
|
'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 =>
|
projects_file =>
|
||||||
'puppet:///modules/openstack_project/review-dev.projects.yaml',
|
'puppet:///modules/openstack_project/review-dev.projects.yaml',
|
||||||
projects_config =>
|
projects_config =>
|
||||||
|
Loading…
Reference in New Issue
Block a user