opendev/puppet-germqtt
Code Issues Proposed changes

Fix pidfile usage

Browse Source 
and fix other things...
This commit is contained in:
Matthew Treinish 2016-07-19 18:20:32 -04:00
parent 0ee3fe0852
commit 0f429b7d8d
No known key found for this signature in database
GPG Key ID: FD12A0F214C9E177
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/server.pp
View File

@ -17,10 +17,12 @@
class germqtt::server ( class germqtt::server (
gerrit_username, gerrit_username,
gerrit_hostname = review.openstack.org, gerrit_hostname = 'review.openstack.org',
gerrit_key, gerrit_key,
mqtt_hostname = firehose01.openstack.org, mqtt_hostname = 'firehose01.openstack.org',
topic = gerrit topic = 'gerrit',
pid_file = '/var/run/germqtt.pid',
) { ) {
file { '/etc/germqtt.conf': file { '/etc/germqtt.conf':
ensure => present, ensure => present,

3
templates/germqtt.conf.erb
View File

@ -1,3 +1,6 @@
[default]
pidfile = <%= @pid_file %>
[gerrit] [gerrit]
username = <%= @gerrit_username %> username = <%= @gerrit_username %>
hostname = <%= @gerrit_hostname %> hostname = <%= @gerrit_hostname %>

2
templates/germqtt.service.erb
View File

@ -4,7 +4,7 @@ Description=Germqtt Daemon
[Service] [Service]
Type=forking Type=forking
PIDFile=<%= @pid_file %> PIDFile=<%= @pid_file %>
ExecStart=/usr/local/bin/germqtt.py -c /etc/germqtt/germqtt.conf -p <%= @pid_file %> ExecStart=/usr/local/bin/germqtt.py /etc/germqtt/germqtt.conf
User=germqtt User=germqtt
Group=germqtt Group=germqtt