From f1d119767b093e7f58c858f0a26c934a8c198330 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 26 Mar 2013 01:43:51 +0000
Subject: [PATCH] Pass openstackwatch swift creds through to gerrit.

* 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
---
 modules/openstack_project/manifests/review.pp     | 6 +++++-
 modules/openstack_project/manifests/review_dev.pp | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 084e3cf745..08501342e8 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -54,7 +54,9 @@ class openstack_project::review (
   $contactstore_appsec='',
   $contactstore_pubkey='',
   $replicate_github=true,
-  $sysadmins = []
+  $sysadmins = [],
+  $swift_username = '',
+  $swift_password = ''
 ) {
   class { 'openstack_project::gerrit':
     ssl_cert_file                   =>
@@ -102,6 +104,8 @@ class openstack_project::review (
     email_private_key               => $email_private_key,
     replicate_github                => $replicate_github,
     sysadmins                       => $sysadmins,
+    swift_username                  => $swift_username,
+    swift_password                  => $swift_password,
   }
   class { 'gerritbot':
     nick       => 'openstackgerrit',
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 1425f8100d..2b1336464e 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -21,7 +21,9 @@ class openstack_project::review_dev (
   $lp_sync_token = '',
   $lp_sync_secret = '',
   $replicate_github = true,
-  $sysadmins = []
+  $sysadmins = [],
+  $swift_username = '',
+  $swift_password = ''
 ) {
   class { 'openstack_project::gerrit':
     vhost_name                      => 'review-dev.openstack.org',
@@ -59,6 +61,8 @@ class openstack_project::review_dev (
     email_private_key               => $email_private_key,
     replicate_github                => $replicate_github,
     sysadmins                       => $sysadmins,
+    swift_username                  => $swift_username,
+    swift_password                  => $swift_password,
   }
 
   file { '/var/log/gerrit_user_sync':