opendev
/
system-config
Code Issues Proposed changes

Merge "Support restTokenPrivateKey on review.o.o"

This commit is contained in:
Jenkins 2015-05-09 18:14:55 +00:00 committed by Gerrit Code Review
parent 7bc1f48592 2dd8bb8d69
commit 920e8b9999
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -61,6 +61,7 @@ node 'review.openstack.org' {
mysql_host => hiera('gerrit_mysql_host', 'localhost'),
mysql_password => hiera('gerrit_mysql_password', 'XXX'),
email_private_key => hiera('gerrit_email_private_key', 'XXX'),
token_private_key => hiera('gerrit_rest_token_private_key', 'XXX'),
gerritbot_password => hiera('gerrit_gerritbot_password', 'XXX'),
gerritbot_ssh_rsa_key_contents => hiera('gerritbot_ssh_rsa_key_contents', 'XXX'),
gerritbot_ssh_rsa_pubkey_contents => hiera('gerritbot_ssh_rsa_pubkey_contents', 'XXX'),

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

@ -53,6 +53,7 @@ class openstack_project::gerrit (
$github_project_password = '',
$trivial_rebase_role_id = '',
$email_private_key = '',
$token_private_key = '',
$replicate_local = true,
$replication_force_update = true,
$replication = [],
@ -196,6 +197,7 @@ class openstack_project::gerrit (
mysql_host => $mysql_host,
mysql_password => $mysql_password,
email_private_key => $email_private_key,
token_private_key => $token_private_key,
replicate_local => $replicate_local,
replicate_path => $local_git_dir,
replication_force_update => $replication_force_update,

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

@ -41,6 +41,7 @@ class openstack_project::review (
$mysql_host = '',
$mysql_password = '',
$email_private_key = '',
$token_private_key = '',
# Register an IRC bot and supply it's password here.
$gerritbot_password = '',
$gerritbot_ssh_rsa_key_contents = '',
@ -131,6 +132,7 @@ class openstack_project::review (
mysql_host => $mysql_host,
mysql_password => $mysql_password,
email_private_key => $email_private_key,
token_private_key => $token_private_key,
sysadmins => $sysadmins,
swift_username => $swift_username,
swift_password => $swift_password,