opendev/system-config
Code Issues Proposed changes

Pass openstackwatch swift creds through to gerrit.

Browse Source 
* modules/openstack_project/manifests/review.pp
* modules/openstack_project/manifests/review_dev.pp: Provide a
missing conduit for openstackwatch swift credentials from the global
site.pp through to the openstack_project::gerrit class.

Change-Id: Ie89c3e098323216373c0b3aecfd7e3f9993fc18e
Reviewed-on: https://review.openstack.org/25357
Reviewed-by: Anita Kuno <akuno@lavabit.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-03-26 01:43:51 +00:00 committed by Jenkins
parent 0a893d5c44
commit f1d119767b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,9 @@ class openstack_project::review (
$contactstore_appsec='', $contactstore_appsec='',
$contactstore_pubkey='', $contactstore_pubkey='',
$replicate_github=true, $replicate_github=true,
$sysadmins = [] $sysadmins = [],
$swift_username = '',
$swift_password = ''
) { ) {
class { 'openstack_project::gerrit': class { 'openstack_project::gerrit':
ssl_cert_file => ssl_cert_file =>
@ -102,6 +104,8 @@ class openstack_project::review (
email_private_key => $email_private_key, email_private_key => $email_private_key,
replicate_github => $replicate_github, replicate_github => $replicate_github,
sysadmins => $sysadmins, sysadmins => $sysadmins,
swift_username => $swift_username,
swift_password => $swift_password,
} }
class { 'gerritbot': class { 'gerritbot':
nick => 'openstackgerrit', nick => 'openstackgerrit',

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

@ -21,7 +21,9 @@ class openstack_project::review_dev (
$lp_sync_token = '', $lp_sync_token = '',
$lp_sync_secret = '', $lp_sync_secret = '',
$replicate_github = true, $replicate_github = true,
$sysadmins = [] $sysadmins = [],
$swift_username = '',
$swift_password = ''
) { ) {
class { 'openstack_project::gerrit': class { 'openstack_project::gerrit':
vhost_name => 'review-dev.openstack.org', vhost_name => 'review-dev.openstack.org',
@ -59,6 +61,8 @@ class openstack_project::review_dev (
email_private_key => $email_private_key, email_private_key => $email_private_key,
replicate_github => $replicate_github, replicate_github => $replicate_github,
sysadmins => $sysadmins, sysadmins => $sysadmins,
swift_username => $swift_username,
swift_password => $swift_password,
} }
file { '/var/log/gerrit_user_sync': file { '/var/log/gerrit_user_sync':