From 15f9a6edd7a4b3f44451d0cec8b061be840437ef Mon Sep 17 00:00:00 2001 From: Elizabeth Krumbach Date: Tue, 19 Mar 2013 15:11:33 -0700 Subject: [PATCH] Add reviewday variables to static class Add the reviewday variables from hiera to the openstack_project::static class. Change-Id: I33a24a572ba504d87de38fbe7ec0dc00bbfef6ee Reviewed-on: https://review.openstack.org/24850 Reviewed-by: Anita Kuno Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/openstack_project/manifests/static.pp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 478fb82236..23af3666b1 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -1,7 +1,10 @@ # == Class: openstack_project::static # class openstack_project::static ( - $sysadmins = [] + $sysadmins = [], + $reviewday_gerrit_ssh_key = '', + $reviewday_rsa_pubkey_contents = '', + $reviewday_rsa_key_contents = '' ) { class { 'openstack_project::server': @@ -136,8 +139,11 @@ class openstack_project::static ( httproot => "/srv/static/${name}", } reviewday::init { 'reviewday.openstack.org': - gerrit_url => 'review.openstack.org', - gerrit_port => '29418', - gerrit_user => 'reviewday', + gerrit_url => 'review.openstack.org', + gerrit_port => '29418', + gerrit_user => 'reviewday', + reviewday_gerrit_ssh_key => $reviewday_gerrit_ssh_key, + reviewday_rsa_pubkey_contents => $reviewday_rsa_pubkey_contents, + reviewday_rsa_key_contents => $reviewday_rsa_key_contents, } }