opendev/system-config
Code Issues Proposed changes

make contactstore option overridable

Browse Source 
This change allows a parent puppet module to easily override the contactstore
setting.  I found that it makes it easier to test gerrit if i can turn off
contactstore on my test config.

Change-Id: I5128013b8c196fd956237baebe02f57b771a1e89
This commit is contained in:
Khai Do 2014-04-07 09:57:48 -07:00
parent 0ca0fb35cf
commit 922dbc8440
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ class openstack_project::review (
$lp_sync_secret='', $lp_sync_secret='',
# For gerrit's contactstore feature # For gerrit's contactstore feature
# https://review.openstack.org/Documentation/config-contact.html # https://review.openstack.org/Documentation/config-contact.html
$contactstore = true,
$contactstore_appsec='', $contactstore_appsec='',
$contactstore_pubkey='', $contactstore_pubkey='',
$sysadmins = [], $sysadmins = [],
@ -113,7 +114,7 @@ class openstack_project::review (
httpd_maxwait => '5000min', httpd_maxwait => '5000min',
war => war =>
'http://tarballs.openstack.org/ci/gerrit-2.4.4-14-gab7f4c1.war', 'http://tarballs.openstack.org/ci/gerrit-2.4.4-14-gab7f4c1.war',
contactstore => true, contactstore => $contactstore,
contactstore_appsec => $contactstore_appsec, contactstore_appsec => $contactstore_appsec,
contactstore_pubkey => $contactstore_pubkey, contactstore_pubkey => $contactstore_pubkey,
contactstore_url => contactstore_url =>

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

@ -7,6 +7,7 @@ class openstack_project::review_dev (
$mysql_password = '', $mysql_password = '',
$mysql_root_password = '', $mysql_root_password = '',
$email_private_key = '', $email_private_key = '',
$contactstore = true,
$contactstore_appsec = '', $contactstore_appsec = '',
$contactstore_pubkey = '', $contactstore_pubkey = '',
$ssh_dsa_key_contents = '', $ssh_dsa_key_contents = '',
@ -50,7 +51,7 @@ class openstack_project::review_dev (
email => 'review-dev@openstack.org', email => 'review-dev@openstack.org',
war => war =>
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.8.3.5.ce9b043.war', 'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.8.3.5.ce9b043.war',
contactstore => true, contactstore => $contactstore,
contactstore_appsec => $contactstore_appsec, contactstore_appsec => $contactstore_appsec,
contactstore_pubkey => $contactstore_pubkey, contactstore_pubkey => $contactstore_pubkey,
contactstore_url => contactstore_url =>