[openstack-heat/el6-grizzly] fix init scripts to call correct executables

[Jeff Peeler]

commit 3f82b888247ec6012518b5f6943131e40fdacff6
Author: Pádraig Brady <pbrady at redhat.com>
Date:   Fri Dec 6 13:01:18 2013 +0000

    fix init scripts to call correct executables
    
    Resolves: rhbz#1035053
    
    Signed-off-by: Jeff Peeler <jpeeler at redhat.com>
    
    Conflicts:
    	openstack-heat-api-cfn.init
    	openstack-heat-api-cloudwatch.init
    	openstack-heat-api.init
    	openstack-heat-engine.init

 openstack-heat-api-cfn.init        |    4 ++--
 openstack-heat-api-cloudwatch.init |    4 ++--
 openstack-heat-api.init            |    4 ++--
 openstack-heat-engine.init         |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/openstack-heat-api-cfn.init b/openstack-heat-api-cfn.init
index 102926c..0438b94 100644
--- a/openstack-heat-api-cfn.init
+++ b/openstack-heat-api-cfn.init
@@ -21,8 +21,8 @@
 . /etc/rc.d/init.d/functions
 
 prog=openstack-heat-api-cfn
-exec="/usr/bin/$prog"
-config="/etc/heat/$prog.conf"
+exec="/usr/bin/heat-api-cfn"
+config="/etc/heat/heat-api-cfn.conf"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-heat-api-cloudwatch.init b/openstack-heat-api-cloudwatch.init
index 16b02f3..246af7b 100644
--- a/openstack-heat-api-cloudwatch.init
+++ b/openstack-heat-api-cloudwatch.init
@@ -19,8 +19,8 @@
 . /etc/rc.d/init.d/functions
 
 prog=openstack-heat-api-cloudwatch
-exec="/usr/bin/$prog"
-config="/etc/heat/$prog.conf"
+exec="/usr/bin/heat-api-cloudwatch"
+config="/etc/heat/heat-api-cloudwatch.conf"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-heat-api.init b/openstack-heat-api.init
index c6ee39b..7d0bd5e 100644
--- a/openstack-heat-api.init
+++ b/openstack-heat-api.init
@@ -21,8 +21,8 @@
 . /etc/rc.d/init.d/functions
 
 prog=openstack-heat-api
-exec="/usr/bin/$prog"
-config="/etc/heat/$prog.conf"
+exec="/usr/bin/heat-api"
+config="/etc/heat/heat-api.conf"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-heat-engine.init b/openstack-heat-engine.init
index ede8dda..bbe109b 100644
--- a/openstack-heat-engine.init
+++ b/openstack-heat-engine.init
@@ -19,8 +19,8 @@
 . /etc/rc.d/init.d/functions
 
 prog=openstack-heat-engine
-exec="/usr/bin/$prog"
-config="/etc/heat/$prog.conf"
+exec="/usr/bin/heat-engine"
+config="/etc/heat/heat-engine.conf"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog