From 0f429b7d8d0e79091f02201ad64c8b54c4cf9c61 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Tue, 19 Jul 2016 18:20:32 -0400
Subject: [PATCH] Fix pidfile usage

and fix other things...
---
 manifests/server.pp           | 8 +++++---
 templates/germqtt.conf.erb    | 3 +++
 templates/germqtt.service.erb | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/manifests/server.pp b/manifests/server.pp
index 215705b..585b543 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -17,10 +17,12 @@
 
 class germqtt::server (
  gerrit_username,
- gerrit_hostname = review.openstack.org,
+ gerrit_hostname = 'review.openstack.org',
  gerrit_key,
- mqtt_hostname = firehose01.openstack.org,
- topic = gerrit
+ mqtt_hostname = 'firehose01.openstack.org',
+ topic = 'gerrit',
+ pid_file = '/var/run/germqtt.pid',
+
 ) {
   file { '/etc/germqtt.conf':
     ensure  => present,
diff --git a/templates/germqtt.conf.erb b/templates/germqtt.conf.erb
index 1619440..760ce0b 100644
--- a/templates/germqtt.conf.erb
+++ b/templates/germqtt.conf.erb
@@ -1,3 +1,6 @@
+[default]
+pidfile = <%= @pid_file %>
+
 [gerrit]
 username = <%= @gerrit_username %>
 hostname = <%= @gerrit_hostname %>
diff --git a/templates/germqtt.service.erb b/templates/germqtt.service.erb
index b7486c4..a43f37b 100644
--- a/templates/germqtt.service.erb
+++ b/templates/germqtt.service.erb
@@ -4,7 +4,7 @@ Description=Germqtt Daemon
 [Service]
 Type=forking
 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
 Group=germqtt