From 2dd8bb8d6993bf75412a780edaa82ea71d573417 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 9 May 2015 16:41:12 +0000 Subject: [PATCH] Support restTokenPrivateKey on review.o.o It's not clear what this does, but pass it in just in case it's important. Depends-On: I3f3b2f11556f2bd745bfd2177982061128df11af Change-Id: I35f0ffd6c54e00f996a9304c045a731e37f32b45 --- manifests/site.pp | 1 + modules/openstack_project/manifests/gerrit.pp | 2 ++ modules/openstack_project/manifests/review.pp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 415d2afaaf..60b77d797c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 4b65ded2bf..4d94fa4eeb 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -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, diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp index f8bb153578..46f16d0e3c 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -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,