opendev
/
puppet-elastic_recheck
Code Issues Proposed changes

Use the new --conf option to pass in values 

Keep parameters in sync by using the same source of them:
the elastic-recheck.conf file.

Change-Id: I5fd2bc05f1cd6647fa43aaa307c47935c64b5f36
Depends-on: I282745796a40f10955e0c9893e817779b2d4d55a
This commit is contained in:
Ramy Asselin 2015-10-20 22:22:56 +00:00
parent 1d93e6581d
commit 6b6a684c17
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/bot.pp
View File

@ -25,6 +25,7 @@ class elastic_recheck::bot (
$recheck_bot_passwd,
$recheck_bot_nick,
$elastic_search_url = 'http://logstash.openstack.org/elasticsearch',
$logstash_url = 'http://logstash.openstack.org',
$subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql',
$daemon_args = undef,
) {

12
manifests/cron.pp
View File

@ -17,15 +17,11 @@
# service.
#
class elastic_recheck::cron (
$uncat_cmd_options = undef,
$graph_all_cmd_options = undef,
$graph_gate_cmd_options = undef,
) {
class elastic_recheck::cron () {
$er_state_path = '/var/lib/elastic-recheck'
$graph_all_cmd = "elastic-recheck-graph /opt/elastic-recheck/queries -o all-new.json ${graph_all_cmd_options} && mv all-new.json all.json"
$graph_gate_cmd = "elastic-recheck-graph /opt/elastic-recheck/queries -o gate-new.json -q gate ${graph_gate_cmd_options} && mv gate-new.json gate.json"
$uncat_cmd = "elastic-recheck-uncategorized -d /opt/elastic-recheck/queries -t /usr/local/share/elastic-recheck/templates -o uncategorized-new.html ${uncat_cmd_options} && mv uncategorized-new.html uncategorized.html"
$graph_all_cmd = "elastic-recheck-graph /opt/elastic-recheck/queries -o all-new.json --conf /etc/elatic-recheck/elastic-recheck.conf && mv all-new.json all.json"
$graph_gate_cmd = "elastic-recheck-graph /opt/elastic-recheck/queries -o gate-new.json -q gate --conf /etc/elatic-recheck/elastic-recheck.conf && mv gate-new.json gate.json"
$uncat_cmd = "elastic-recheck-uncategorized -d /opt/elastic-recheck/queries -t /usr/local/share/elastic-recheck/templates -o uncategorized-new.html --conf /etc/elatic-recheck/elastic-recheck.conf && mv uncategorized-new.html uncategorized.html"
cron { 'elastic-recheck-all':
user => 'recheck',

1
templates/elastic-recheck.conf.erb
View File

@ -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 %>