From 776f027d5ca190510063923d8646263b44a078de Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero@redhat.com>
Date: Sat, 11 Jan 2014 22:33:55 -0700
Subject: [PATCH] Fixes qpid SSL installation errors

When you're running packstack with qpid SSL enabled
enabled you get an error if qpid is not alreadt running

When qpid authentication is enabled the file
/var/lib/qpidd/qpidd.sasldb is created with the wrong
permissions.

Fixes: rhbz#1052163

Change-Id: I89a7de13724b5280789ffd4f4b09628001405de4
---
 packstack/puppet/templates/qpid_auth.pp | 8 ++++++++
 packstack/puppet/templates/qpid_ssl.pp  | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packstack/puppet/templates/qpid_auth.pp b/packstack/puppet/templates/qpid_auth.pp
index 7c668240f..bbc831216 100644
--- a/packstack/puppet/templates/qpid_auth.pp
+++ b/packstack/puppet/templates/qpid_auth.pp
@@ -5,3 +5,11 @@ qpid_user { '%(CONFIG_QPID_AUTH_USER)s':
     provider => 'saslpasswd2',
     require   => Class['qpid::server'],
 }
+
+file { 'sasldb_file':
+    path => '/var/lib/qpidd/qpidd.sasldb',
+    ensure => file,
+    owner => 'qpidd',
+    group => 'qpidd',
+}
+
diff --git a/packstack/puppet/templates/qpid_ssl.pp b/packstack/puppet/templates/qpid_ssl.pp
index 21312ac26..cf5250966 100644
--- a/packstack/puppet/templates/qpid_ssl.pp
+++ b/packstack/puppet/templates/qpid_ssl.pp
@@ -6,14 +6,15 @@ group { 'qpidd':
 
 exec { 'stop_qpid' :
         command => '/sbin/service qpidd stop',
+        onlyif  => '/sbin/service qpidd status',
 }
 
 user { 'qpidd':
     ensure     => 'present',
     managehome => true,
     home       => '/var/run/qpidd',
-    require => Group['qpidd'],
-    before => Class['qpid::server']
+    gid        => 'qpidd',
+    before     => Class['qpid::server']
 }
 
 Exec['stop_qpid']->User['qpidd']