Merge "Disable Gerrit auto-abandon"

This commit is contained in:
Jenkins
2014-06-01 04:01:10 +00:00
committed by Gerrit Code Review
4 changed files with 7 additions and 25 deletions

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,

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 =>

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 =>