From 05431ccc6b319512fd8821291582204c4d13196b Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Mon, 25 Jul 2016 17:10:22 -0400
Subject: [PATCH] Make things work

---
 manifests/init.pp             |  2 ++
 manifests/server.pp           | 19 +++++++++----------
 templates/germqtt.service.erb |  5 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index c7e6b50..6c51735 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,6 +8,8 @@
 #   Explanation of what this parameter affects and what it defaults to.
 #
 class germqtt {
+  include ::pip
+
   package {'germqtt':
     ensure   => latest,
     provider => 'pip',
diff --git a/manifests/server.pp b/manifests/server.pp
index 585b543..695e735 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -16,13 +16,12 @@
 #   
 
 class germqtt::server (
- gerrit_username,
- gerrit_hostname = 'review.openstack.org',
- gerrit_key,
- mqtt_hostname = 'firehose01.openstack.org',
- topic = 'gerrit',
- pid_file = '/var/run/germqtt.pid',
-
+  $gerrit_username,
+  $gerrit_hostname = 'review.openstack.org',
+  $gerrit_key,
+  $mqtt_hostname = 'firehose01.openstack.org',
+  $topic = 'gerrit',
+  $pid_file = '/var/run/germqtt.pid',
 ) {
   file { '/etc/germqtt.conf':
     ensure  => present,
@@ -40,15 +39,15 @@ class germqtt::server (
     ensure => present,
     system => true,
   }
-  service { "germqtt":
+  service { 'germqtt':
     enable     => true,
     hasrestart => true,
     subscribe  => [
-      File['/etc/germqtt/germqtt.conf'],
+      File['/etc/germqtt.conf'],
       Package['germqtt'],
     ],
     require    => [
-      File['/etc/systemd/system/germqtt.service']
+      File['/etc/systemd/system/germqtt.service'],
       User['germqtt'],
     ],
   }
diff --git a/templates/germqtt.service.erb b/templates/germqtt.service.erb
index a43f37b..9f3e053 100644
--- a/templates/germqtt.service.erb
+++ b/templates/germqtt.service.erb
@@ -2,9 +2,8 @@
 Description=Germqtt Daemon
 
 [Service]
-Type=forking
-PIDFile=<%= @pid_file %>
-ExecStart=/usr/local/bin/germqtt.py /etc/germqtt/germqtt.conf
+Type=simple
+ExecStart=/usr/local/bin/germqtt /etc/germqtt.conf --foreground
 User=germqtt
 Group=germqtt