[openstack-quantum/el6-grizzly] quantum-ovs-cleanup service: remove reference to quantum-dist.conf

[Pádraig Brady]

commit 2e2289683f857f65c0559b9954a26bc37f72a247
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Apr 29 10:13:59 2013 +0100

    quantum-ovs-cleanup service: remove reference to quantum-dist.conf

 openstack-quantum.spec      |    5 ++++-
 quantum-ovs-cleanup.init    |    2 +-
 quantum-ovs-cleanup.upstart |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 046739e..7334c96 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-quantum
 Version:	2013.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	OpenStack Networking Service
 
 Group:		Applications/System
@@ -743,6 +743,9 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Pádraig Brady <pbrady at redhat.com> 2013.1-3
+- Fix quantum-ovs-cleanup.init to reference the correct config files
+
 * Wed Apr  4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-1
 - Update to grizzly release
 
diff --git a/quantum-ovs-cleanup.init b/quantum-ovs-cleanup.init
index e2001a7..7540cf7 100644
--- a/quantum-ovs-cleanup.init
+++ b/quantum-ovs-cleanup.init
@@ -21,7 +21,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
-    $exec --config-file /usr/share/$proj/$proj-dist.conf --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null
+    $exec --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
diff --git a/quantum-ovs-cleanup.upstart b/quantum-ovs-cleanup.upstart
index e100eb2..8cba0b5 100644
--- a/quantum-ovs-cleanup.upstart
+++ b/quantum-ovs-cleanup.upstart
@@ -4,4 +4,4 @@ start on stopped rc RUNLEVEL=[2345]
 
 task
 
-exec su -s /bin/sh -c "exec /usr/bin/quantum-ovs-cleanup --config-file /usr/share/quantum/quantum-dist.conf --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini" quantum
+exec su -s /bin/sh -c "exec /usr/bin/quantum-ovs-cleanup --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini" quantum