From f4b8278a854a29ee06864f7266ad17e83000457a Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 20 Sep 2012 19:53:29 +0000 Subject: [PATCH] Fix Gerrit CLA database adjustment on review-dev. * 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 Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- modules/openstack_project/manifests/gerrit.pp | 4 ---- modules/openstack_project/manifests/review_dev.pp | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 88e6c02b5e..06392a3df3 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -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', diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp index 6974897ab8..efa0a9c57d 100644 --- a/modules/openstack_project/manifests/review_dev.pp +++ b/modules/openstack_project/manifests/review_dev.pp @@ -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':