[openstack-heat] Fix a few problems related to daemon startup

[Jeff Peeler]

commit e876c349bb70c89920f387e828892cafb1b34867
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Wed Sep 11 17:52:46 2013 -0400

    Fix a few problems related to daemon startup
    
    fixed init scripts (rhbz 1006868)
    added python-babel
    added python-pbr dependency (rhbz 1006911)
    
    Closes bz #1006868
    Closes bz #1006911

 openstack-heat-api-cfn.service        |    2 +-
 openstack-heat-api-cloudwatch.service |    2 +-
 openstack-heat-api.service            |    2 +-
 openstack-heat-engine.service         |    2 +-
 openstack-heat.spec                   |    9 ++++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/openstack-heat-api-cfn.service b/openstack-heat-api-cfn.service
index 5acea46..04ab1ba 100644
--- a/openstack-heat-api-cfn.service
+++ b/openstack-heat-api-cfn.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 TYpe=simple
 User=heat
-ExecStart=/usr/bin/heat-api-cfn --config-file /etc/heat/heat-api-cfn.conf --logfile /var/log/heat/api-cfn.log
+ExecStart=/usr/bin/heat-api-cfn --logfile /var/log/heat/api-cfn.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-heat-api-cloudwatch.service b/openstack-heat-api-cloudwatch.service
index 3232e4a..fde13a5 100644
--- a/openstack-heat-api-cloudwatch.service
+++ b/openstack-heat-api-cloudwatch.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=heat
-ExecStart=/usr/bin/heat-api-cloudwatch --config-file /etc/heat/heat-api-cloudwatch.conf --logfile /var/log/heat/api-cloudwatch.log
+ExecStart=/usr/bin/heat-api-cloudwatch --logfile /var/log/heat/api-cloudwatch.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-heat-api.service b/openstack-heat-api.service
index bf00c14..6b8ae4c 100644
--- a/openstack-heat-api.service
+++ b/openstack-heat-api.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=heat
-ExecStart=/usr/bin/heat-api --config-file /etc/heat/heat-api.conf --logfile /var/log/heat/api.log
+ExecStart=/usr/bin/heat-api --logfile /var/log/heat/api.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-heat-engine.service b/openstack-heat-engine.service
index 38059a7..fbe7b57 100644
--- a/openstack-heat-engine.service
+++ b/openstack-heat-engine.service
@@ -5,7 +5,7 @@ After=syslog.target network.target qpidd.service mysqld.service openstack-keysto
 [Service]
 Type=simple
 User=heat
-ExecStart=/usr/bin/heat-engine --config-file /etc/heat/heat-engine.conf --logfile /var/log/heat/engine.log
+ExecStart=/usr/bin/heat-engine --logfile /var/log/heat/engine.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 9359b05..2a4a92f 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2013.2
-Release:	0.6.%{release_letter}%{milestone}%{?dist}
+Release:	0.7.%{release_letter}%{milestone}%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -150,6 +150,8 @@ Requires: m2crypto
 Requires: python-anyjson
 Requires: python-paramiko
 Requires: python-heatclient
+Requires: python-babel
+Requires: python-pbr
 
 Requires(pre): shadow-utils
 
@@ -300,6 +302,11 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Wed Sep 11 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.7.b3
+- fix init scripts (rhbz 1006868)
+- added python-babel
+- added python-pbr (rhbz 1006911)
+
 * Mon Sep 9 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.6.b3
 - rebase to havana-3
 - remove tests from common