opendev/puppet-elastic_recheck
Code Issues Proposed changes

Allow elastic-recheck daemon args to be specified

Browse Source 
For example, allow passing in --noirc or --nocomment.

Change-Id: I90d3e3bf9dfce70b2de379edee4acfbb68f2ec09
This commit is contained in:
Ramy Asselin 2015-10-16 18:29:26 +00:00
parent 4677af4140
commit f8b1c57f9a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/bot.pp
View File

@ -26,6 +26,7 @@ class elastic_recheck::bot (
$recheck_bot_nick, $recheck_bot_nick,
$elastic_search_url = 'http://logstash.openstack.org/elasticsearch', $elastic_search_url = 'http://logstash.openstack.org/elasticsearch',
$subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql', $subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql',
$daemon_args = undef,
) { ) {
include ::elastic_recheck include ::elastic_recheck
@ -88,11 +89,11 @@ class elastic_recheck::bot (
} }
file { '/etc/init.d/elastic-recheck': file { '/etc/init.d/elastic-recheck':
ensure => present, ensure => present,
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
source => 'puppet:///modules/elastic_recheck/elastic-recheck.init', content => template('elastic_recheck/elastic-recheck.init.erb'),
} }
service { 'elastic-recheck': service { 'elastic-recheck':

2
files/elastic-recheck.init → templates/elastic-recheck.init.erb
View File

@ -18,7 +18,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Elastic Recheck" DESC="Elastic Recheck"
NAME=elastic-recheck NAME=elastic-recheck
DAEMON=/usr/local/bin/$NAME 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 PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
USER=recheck USER=recheck