opendev/system-config
Code Issues Proposed changes

Fix Gerrit CLA and Contact Store on review-dev.

Browse Source 
* modules/openstack_project/manifests/gerrit.pp
(openstack_project::gerrit): Set defaults for contactstore,
contactstore_appsec, contactstore_pubkey and contactstore_url since
openstack_project::review isn't setting any yet.

* modules/openstack_project/manifests/review_dev.pp
(openstack_project::review_dev): Retrieve values for cla_description,
cla_file, cla_id and cla_name from openstack::gerrit where they're
defined.

Change-Id: I010a8cffd2f5c2bd1c04f7f8d5b9a4089551e69f
Reviewed-on: https://review.openstack.org/13378
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2012-09-20 16:44:11 +00:00 committed by Jenkins
parent 25d4e6f4c9
commit 3b1b6f2fd6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,10 @@ class openstack_project::gerrit (
$httpd_maxthreads='', $httpd_maxthreads='',
$httpd_maxwait='', $httpd_maxwait='',
$war, $war,
$contactstore, $contactstore=false,
$contactstore_appsec, $contactstore_appsec='',
$contactstore_pubkey, $contactstore_pubkey='',
$contactstore_url, $contactstore_url='',
$cla_description='OpenStack Individual Contributor License Agreement', $cla_description='OpenStack Individual Contributor License Agreement',
$cla_file='static/cla.html', $cla_file='static/cla.html',
$cla_id='2', $cla_id='2',

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

@ -5,6 +5,10 @@ class openstack_project::review_dev (
$email_private_key, $email_private_key,
$contactstore_appsec, $contactstore_appsec,
$contactstore_pubkey, $contactstore_pubkey,
$cla_description=$openstack_project::gerrit::cla_description,
$cla_file=$openstack_project::gerrit::cla_file,
$cla_id=$openstack_project::gerrit::cla_id,
$cla_name=$openstack_project::gerrit::cla_name,
$sysadmins = [] $sysadmins = []
) { ) {
class { 'openstack_project::gerrit': class { 'openstack_project::gerrit':