From 6c45848ff74f97586ff21ad10b1f7be4aedb0636 Mon Sep 17 00:00:00 2001
From: Evgeny Antyshev <eantyshev@virtuozzo.com>
Date: Fri, 15 Jan 2016 12:36:33 +0000
Subject: [PATCH] puppets: keepalives for gerrit connections
This is to support changes by https://review.openstack.org/268077
Change-Id: Ib193a776bff861a12cb477ee87b848815aee8641
---
monitoring/puppet-ci_scoreboard/manifests/init.pp | 5 +++++
.../puppet-ci_scoreboard/templates/ci-scoreboard.conf.erb | 1 +
2 files changed, 6 insertions(+)
diff --git a/monitoring/puppet-ci_scoreboard/manifests/init.pp b/monitoring/puppet-ci_scoreboard/manifests/init.pp
index f300444..6211492 100644
--- a/monitoring/puppet-ci_scoreboard/manifests/init.pp
+++ b/monitoring/puppet-ci_scoreboard/manifests/init.pp
@@ -40,6 +40,9 @@
#
# [*gerrit_port*]
#
+# [*gerrit_keepalive*]
+# Keepalive interval in seconds, or disabled when 0 (default)
+#
#
# === Examples
#
@@ -57,6 +60,7 @@ class ci_scoreboard (
$ssh_private_key,
$gerrit_hostname = 'review.openstack.org',
$gerrit_port = 29418,
+ $gerrit_keepalive = 0,
) {
$ssh_private_key_file = '/var/lib/scoreboard/ssh/id_rsa'
@@ -108,6 +112,7 @@ class ci_scoreboard (
# ssh_private_key_file
# gerrit_server
# gerrit_port
+ # gerrit_keepalive
# log_file_location
file { '/etc/ci-scoreboard/ci-scoreboard.conf':
content => template('ci_scoreboard/ci-scoreboard.conf.erb'),
diff --git a/monitoring/puppet-ci_scoreboard/templates/ci-scoreboard.conf.erb b/monitoring/puppet-ci_scoreboard/templates/ci-scoreboard.conf.erb
index 3c463af..65748bb 100644
--- a/monitoring/puppet-ci_scoreboard/templates/ci-scoreboard.conf.erb
+++ b/monitoring/puppet-ci_scoreboard/templates/ci-scoreboard.conf.erb
@@ -3,5 +3,6 @@ GERRIT_USER: <%= @gerrit_user %>
GERRIT_KEY: <%= @ssh_private_key_file %>
GERRIT_HOSTNAME: <%= @gerrit_hostname %>
GERRIT_PORT: <%= @gerrit_port %>
+GERRIT_KEEPALIVE: <%= @gerrit_keepalive %>
DB_URI: mongodb://localhost:27017
LOG_FILE_LOCATION: <%= @log_file_location %>