From aac46f14cb0a5ca83c54d1e6aeaf431aa8354ef9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 10 Oct 2012 12:17:36 -0700 Subject: [PATCH] Add second review-dev node. 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 Reviewed-by: Paul Belanger Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- manifests/site.pp | 17 +++++++++++++++++ modules/openstack_project/manifests/gerrit.pp | 3 ++- .../openstack_project/manifests/review_dev.pp | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index b825e992c5..b701c177d7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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' { class { 'openstack_project::jenkins': jenkins_jobs_password => hiera('jenkins_jobs_password'), diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index a7212b3a53..9b27d3d7e7 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -40,6 +40,7 @@ class openstack_project::gerrit ( $mysql_root_password, $trivial_rebase_role_id, $email_private_key, + $replicate_github=true, $testmode=false, $sysadmins=[] ) { @@ -95,7 +96,7 @@ class openstack_project::gerrit ( mysql_root_password => $mysql_root_password, email_private_key => $email_private_key, projects_file => $projects_file, - replicate_github => true, + replicate_github => $replicate_github, testmode => $testmode, require => Class[openstack_project::server], } diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index 4fbc4b3af1..3aac535b05 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -13,6 +13,7 @@ class openstack_project::review_dev ( $lp_sync_pubkey='', # If left empty puppet will not create file. $lp_sync_token='', $lp_sync_secret='', + $replicate_github=true, $sysadmins = [] ) { class { 'openstack_project::gerrit': @@ -37,6 +38,7 @@ class openstack_project::review_dev ( mysql_root_password => $mysql_root_password, trivial_rebase_role_id => 'trivial-rebase@review-dev.openstack.org', email_private_key => $email_private_key, + replicate_github => $replicate_github, sysadmins => $sysadmins }