From 9a3f13c2e75248bb2c6bbefabcc9ee8b5c24850f Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Fri, 23 Oct 2015 22:26:14 +0000 Subject: [PATCH] Allow configuration of logstash url Elastic recheck commands pull the logstash url from the provided configuration file. Allow this url to be set. Change-Id: I5fd2bc05f1cd6647fa43aaa307c47935c64b5f36 Depends-on: I282745796a40f10955e0c9893e817779b2d4d55a --- manifests/bot.pp | 1 + templates/elastic-recheck.conf.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/bot.pp b/manifests/bot.pp index ac19705..5d727f3 100644 --- a/manifests/bot.pp +++ b/manifests/bot.pp @@ -25,6 +25,7 @@ class elastic_recheck::bot ( $recheck_bot_passwd, $recheck_bot_nick, $elastic_search_url = 'http://logstash.openstack.org:80/elasticsearch', + $logstash_url = 'http://logstash.openstack.org', $subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql', $daemon_args = undef, ) { diff --git a/templates/elastic-recheck.conf.erb b/templates/elastic-recheck.conf.erb index c12c40f..739ce30 100644 --- a/templates/elastic-recheck.conf.erb +++ b/templates/elastic-recheck.conf.erb @@ -15,4 +15,5 @@ key=/home/recheck/.ssh/id_rsa [data_source] es_url=<%= @elastic_search_url %> +ls_url=<%= @logstash_url %> db_uri=<%= @subunit2sql_db_uri %>