opendev/system-config
Code Issues Proposed changes

Fix Gerrit CLA database adjustment on review-dev.

Browse Source 
* modules/openstack_project/manifests/gerrit.pp
(openstack_project::gerrit): Remove cla_description, cla_file, cla_id
and cla_name since they'll be defined in openstack_project::review_dev
instead.

* modules/openstack_project/manifests/review_dev.pp
(openstack_project::review_dev): Define cla_description, cla_file,
cla_id and cla_name here instead of inferring them from
openstack_project::gerrit.

Change-Id: Ie786ce5527b30895fdf59d93abc2154261e84155
Reviewed-on: https://review.openstack.org/13402
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 19:53:29 +00:00 committed by Jenkins
parent 0dabbe573b
commit f4b8278a85
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,6 @@ class openstack_project::gerrit (
$contactstore_appsec='',
$contactstore_pubkey='',
$contactstore_url='',
$cla_description='OpenStack Individual Contributor License Agreement',
$cla_file='static/cla.html',
$cla_id='2',
$cla_name='ICLA',
$script_user='update',
$script_key_file='/home/gerrit2/.ssh/id_rsa',
$script_logging_conf='/home/gerrit2/.sync_logging.conf',

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

@ -5,10 +5,10 @@ class openstack_project::review_dev (
$email_private_key,
$contactstore_appsec,
$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,
$cla_description='OpenStack Individual Contributor License Agreement',
$cla_file='static/cla.html',
$cla_id='2',
$cla_name='ICLA',
$sysadmins = []
) {
class { 'openstack_project::gerrit':