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

[Pádraig Brady]

commit 1fd2b8a250b3c860a14a4cfa1cac558b22b9e8bd
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      |    7 +++++--
 quantum-ovs-cleanup.init    |    2 +-
 quantum-ovs-cleanup.upstart |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index a479dcd..2101b1c 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
 
 Name:		openstack-quantum
 Version:	2012.2.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Virtual network service for OpenStack (quantum)
 
 Group:		Applications/System
@@ -581,8 +581,11 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Pádraig Brady <pbrady at redhat.com> 2012.2.3-3
+- Fix quantum-ovs-cleanup.init to reference the correct config files
+
 * Mon Mar  4 2013 Terry Wilson <twilson at redhat.com> 2012.2.3-2
-- Add quantum-ovs-cleanup.service
+- Add quantum-ovs-cleanup.init
 
 * Mon Feb 11 2013 Alan Pevec <apevec at redhat.com> 2012.2.3-1
 - Update to folsom stable 2012.2.3
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