From 052542c002ada5cbb44376ca32d519d20dedb218 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Wed, 11 Feb 2015 16:48:18 -0800
Subject: [PATCH] Add the Gerrit replication plugin paramater
 'defaultForceUpdate'

The Gerrit 2.9 replication plugin added an explicit defaultForceUpdate
parameter.  This change adds it to the puppet script and sets the parameter
to true.

Depends-on: Ia77319ec95636e42d0b0860901dc6f3b34f4750d
Change-Id: I716d4afcd8d503edd1b66d5ea732a151e66b09e4
---
 modules/openstack_project/manifests/gerrit.pp     | 2 ++
 modules/openstack_project/manifests/review.pp     | 1 +
 modules/openstack_project/manifests/review_dev.pp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 7254e53648..ab07b967d1 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -54,6 +54,7 @@ class openstack_project::gerrit (
   $trivial_rebase_role_id = '',
   $email_private_key = '',
   $replicate_local = true,
+  $replication_force_update = true,
   $replication = [],
   $local_git_dir = '/opt/lib/git',
   $jeepyb_cache_dir = '/opt/lib/jeepyb',
@@ -197,6 +198,7 @@ class openstack_project::gerrit (
     email_private_key                   => $email_private_key,
     replicate_local                     => $replicate_local,
     replicate_path                      => $local_git_dir,
+    replication_force_update            => $replication_force_update,
     replication                         => $replication,
     gitweb                              => $gitweb,
     cgit                                => $cgit,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 76c97b9bbe..29d06ab810 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -134,6 +134,7 @@ class openstack_project::review (
     sysadmins                           => $sysadmins,
     swift_username                      => $swift_username,
     swift_password                      => $swift_password,
+    replication_force_update            => true,
     replication                         => [
       {
         name                 => 'github',
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 624706bb9d..154fafd99b 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -72,6 +72,7 @@ class openstack_project::review_dev (
     web_repo_url                    => 'https://git.openstack.org/cgit/',
     swift_username                  => $swift_username,
     swift_password                  => $swift_password,
+    replication_force_update        => true,
     replication                     => [
       {
         name                 => 'github',