From 17c836ab28a69b77de8c506fda8cea363f12623d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 25 Jun 2012 13:26:46 -0700
Subject: [PATCH] Enable Melody on review-dev.
Review-dev is running a Melody capable WAR, but the Melody service
was not enabled. Enable it.
Change-Id: I68934151a38c2572f37d996e1c923a880ab9f50f
---
manifests/site.pp | 4 +++-
modules/gerrit/manifests/init.pp | 4 +++-
modules/gerrit/templates/gerrit.config.erb | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 7e6a3e77ee..da2d939986 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -256,7 +256,9 @@ node "gerrit-dev.openstack.org", "review-dev.openstack.org" {
war => 'http://ci.openstack.org/tarballs/test/gerrit-2.4.1-10-g98fd9d8.war',
script_user => 'update',
script_key_file => '/home/gerrit2/.ssh/id_rsa',
- script_site => 'openstack'
+ script_site => 'openstack',
+ enable_melody => 'true',
+ melody_session => 'true'
}
}
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index c997eda815..70eb9be65c 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -85,7 +85,9 @@ class gerrit($virtual_hostname='',
$war,
$script_user,
$script_key_file,
- $script_site
+ $script_site,
+ $enable_melody = 'false',
+ $melody_session = 'false'
) {
# Set this to true to disable cron jobs and replication, which can
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index 3c12e66ce0..c8166d7a16 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -72,3 +72,6 @@
changeTableOutdatedColor = f5cccc
tableOddRowColor = ffffff
tableEvenRowColor = f5f5ff
+[melody]
+ monitoring = <%= enable_melody %>
+ session = <%= melody_session %>