From 922dbc8440bb619af9a679d146b89d5d6d9dfd4c Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Mon, 7 Apr 2014 09:57:48 -0700
Subject: [PATCH] make contactstore option overridable

This change allows a parent puppet module to easily override the contactstore
setting.  I found that it makes it easier to test gerrit if i can turn off
contactstore on my test config.

Change-Id: I5128013b8c196fd956237baebe02f57b771a1e89
---
 modules/openstack_project/manifests/review.pp     | 3 ++-
 modules/openstack_project/manifests/review_dev.pp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index b8ade9e845..6324ba860d 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -67,6 +67,7 @@ class openstack_project::review (
   $lp_sync_secret='',
   # For gerrit's contactstore feature
   # https://review.openstack.org/Documentation/config-contact.html
+  $contactstore = true,
   $contactstore_appsec='',
   $contactstore_pubkey='',
   $sysadmins = [],
@@ -113,7 +114,7 @@ class openstack_project::review (
     httpd_maxwait                       => '5000min',
     war                                 =>
       'http://tarballs.openstack.org/ci/gerrit-2.4.4-14-gab7f4c1.war',
-    contactstore                        => true,
+    contactstore                        => $contactstore,
     contactstore_appsec                 => $contactstore_appsec,
     contactstore_pubkey                 => $contactstore_pubkey,
     contactstore_url                    =>
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 553f2be88c..5170bbdcfe 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -7,6 +7,7 @@ class openstack_project::review_dev (
   $mysql_password = '',
   $mysql_root_password = '',
   $email_private_key = '',
+  $contactstore = true,
   $contactstore_appsec = '',
   $contactstore_pubkey = '',
   $ssh_dsa_key_contents = '',
@@ -50,7 +51,7 @@ class openstack_project::review_dev (
     email                           => 'review-dev@openstack.org',
     war                             =>
       'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.8.3.5.ce9b043.war',
-    contactstore                    => true,
+    contactstore                    => $contactstore,
     contactstore_appsec             => $contactstore_appsec,
     contactstore_pubkey             => $contactstore_pubkey,
     contactstore_url                =>