From f8b1c57f9a6f7a9929fa42208cc1f60efa04d5c9 Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Fri, 16 Oct 2015 18:29:26 +0000 Subject: [PATCH] Allow elastic-recheck daemon args to be specified For example, allow passing in --noirc or --nocomment. Change-Id: I90d3e3bf9dfce70b2de379edee4acfbb68f2ec09 --- manifests/bot.pp | 11 ++++++----- .../elastic-recheck.init.erb | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) rename files/elastic-recheck.init => templates/elastic-recheck.init.erb (98%) diff --git a/manifests/bot.pp b/manifests/bot.pp index cd79d15..2c09bb4 100644 --- a/manifests/bot.pp +++ b/manifests/bot.pp @@ -26,6 +26,7 @@ class elastic_recheck::bot ( $recheck_bot_nick, $elastic_search_url = 'http://logstash.openstack.org/elasticsearch', $subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql', + $daemon_args = undef, ) { include ::elastic_recheck @@ -88,11 +89,11 @@ class elastic_recheck::bot ( } file { '/etc/init.d/elastic-recheck': - ensure => present, - mode => '0755', - owner => 'root', - group => 'root', - source => 'puppet:///modules/elastic_recheck/elastic-recheck.init', + ensure => present, + mode => '0755', + owner => 'root', + group => 'root', + content => template('elastic_recheck/elastic-recheck.init.erb'), } service { 'elastic-recheck': diff --git a/files/elastic-recheck.init b/templates/elastic-recheck.init.erb similarity index 98% rename from files/elastic-recheck.init rename to templates/elastic-recheck.init.erb index 68712ee..9186454 100644 --- a/files/elastic-recheck.init +++ b/templates/elastic-recheck.init.erb @@ -18,7 +18,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Elastic Recheck" NAME=elastic-recheck DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS=/etc/$NAME/$NAME.conf +DAEMON_ARGS="<%= @daemon_args %> /etc/$NAME/$NAME.conf" PIDFILE=/var/run/$NAME/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME USER=recheck