opendev/system-config
Code Issues Proposed changes

Add second review-dev node.

Browse Source 
To accomodate the migration from oneiric to precise VMs for the gerrit
servers create a new review-dev node. This node will have github
replication disabled until it is ready to take over from review-dev.

Change-Id: Ia163c9404ed76e20152eaf71dbe29f5befe6b317
Reviewed-on: https://review.openstack.org/14306
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-10-10 12:17:36 -07:00 committed by Jenkins
parent 71c5e171b4
commit aac46f14cb
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/site.pp
View File

@ -41,6 +41,23 @@ node 'gerrit-dev.openstack.org', 'review-dev.openstack.org' {
} }
} }
node 'review-dev2.openstack.org' {
class { 'openstack_project::review_dev':
github_oauth_token => hiera('gerrit_dev_github_token'),
mysql_password => hiera('gerrit_dev_mysql_password'),
mysql_root_password => hiera('gerrit_dev_mysql_root_password'),
email_private_key => hiera('gerrit_dev_email_private_key'),
contactstore_appsec => hiera('gerrit_dev_contactstore_appsec'),
contactstore_pubkey => hiera('gerrit_dev_contactstore_pubkey'),
lp_sync_key => hiera('gerrit_dev_lp_sync_key'),
lp_sync_pubkey => hiera('gerrit_dev_lp_sync_pubkey'),
lp_sync_token => hiera('gerrit_dev_lp_access_token'),
lp_sync_secret => hiera('gerrit_dev_lp_access_secret'),
replicate_github => false,
sysadmins => hiera('sysadmins'),
}
}
node 'jenkins.openstack.org' { node 'jenkins.openstack.org' {
class { 'openstack_project::jenkins': class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password'), jenkins_jobs_password => hiera('jenkins_jobs_password'),

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

@ -40,6 +40,7 @@ class openstack_project::gerrit (
$mysql_root_password, $mysql_root_password,
$trivial_rebase_role_id, $trivial_rebase_role_id,
$email_private_key, $email_private_key,
$replicate_github=true,
$testmode=false, $testmode=false,
$sysadmins=[] $sysadmins=[]
) { ) {
@ -95,7 +96,7 @@ class openstack_project::gerrit (
mysql_root_password => $mysql_root_password, mysql_root_password => $mysql_root_password,
email_private_key => $email_private_key, email_private_key => $email_private_key,
projects_file => $projects_file, projects_file => $projects_file,
replicate_github => true, replicate_github => $replicate_github,
testmode => $testmode, testmode => $testmode,
require => Class[openstack_project::server], require => Class[openstack_project::server],
} }

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

@ -13,6 +13,7 @@ class openstack_project::review_dev (
$lp_sync_pubkey='', # If left empty puppet will not create file. $lp_sync_pubkey='', # If left empty puppet will not create file.
$lp_sync_token='', $lp_sync_token='',
$lp_sync_secret='', $lp_sync_secret='',
$replicate_github=true,
$sysadmins = [] $sysadmins = []
) { ) {
class { 'openstack_project::gerrit': class { 'openstack_project::gerrit':
@ -37,6 +38,7 @@ class openstack_project::review_dev (
mysql_root_password => $mysql_root_password, mysql_root_password => $mysql_root_password,
trivial_rebase_role_id => 'trivial-rebase@review-dev.openstack.org', trivial_rebase_role_id => 'trivial-rebase@review-dev.openstack.org',
email_private_key => $email_private_key, email_private_key => $email_private_key,
replicate_github => $replicate_github,
sysadmins => $sysadmins sysadmins => $sysadmins
} }