From a45c34a36d96e905ab8548d9a64643be79023607 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 23 May 2013 15:35:35 -0700
Subject: [PATCH] Fix elasticsearch connectivity on logstash.o.o.

The new elasticsearch server needs to be able to connect back to
logstash over the elasticsearch ports. Also make kibana talk to the new
elasticsearch server.

Change-Id: I88af40c7885b263fcef5ff16210f073cd0a696a5
Reviewed-on: https://review.openstack.org/30354
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 manifests/web.pp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/web.pp b/manifests/web.pp
index f853717..23fa185 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -17,7 +17,8 @@
 class logstash::web (
   $vhost_name = $::fqdn,
   $serveradmin = "webmaster@${::fqdn}",
-  $frontend = 'internal'
+  $frontend = 'internal',
+  $elasticsearch_host = 'localhost',
 ) {
   include apache
   a2mod { 'rewrite':
@@ -54,7 +55,9 @@ class logstash::web (
     }
 
     'kibana': {
-      include kibana
+      class { 'kibana':
+        elasticsearch_host => $elasticsearch_host,
+      }
       $vhost = 'logstash/kibana.vhost.erb'
     }