[openstack-quantum/el6: 10/10] Merge from f18 fixup

[Terry Wilson]

commit 0bac2f1381cd97dce9546033a828c26bd4052014
Author: Terry Wilson <twilson at redhat.com>
Date:   Thu Mar 7 15:17:19 2013 -0600

    Merge from f18 fixup
    
    Remove old patches, convert to upstart, etc.

 0001-Treat-invalid-namespace-call.patch |   26 -------------------
 openstack-quantum.spec                  |    9 ++++--
 quantum-ovs-cleanup.init                |   41 +++++++++++++++++++++++++++++++
 quantum-ovs-cleanup.upstart             |    7 +++++
 4 files changed, 54 insertions(+), 29 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index af9603f..a479dcd 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -34,7 +34,7 @@ Source25:	quantum-dhcp-agent.upstart
 Source16:	quantum-l3-agent.init
 Source26:	quantum-l3-agent.upstart
 Source17:	quantum-ovs-cleanup.init
-Source27:	quantum-ovs-clenaup.upstart
+Source27:	quantum-ovs-cleanup.upstart
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-quantum-newdeps.patch
@@ -262,6 +262,7 @@ install -p -D -m 755 bin/quantum-linuxbridge-agent %{buildroot}%{_bindir}/quantu
 install -p -D -m 755 bin/quantum-nec-agent %{buildroot}%{_bindir}/quantum-nec-agent
 install -p -D -m 755 bin/quantum-netns-cleanup %{buildroot}%{_bindir}/quantum-netns-cleanup
 install -p -D -m 755 bin/quantum-openvswitch-agent %{buildroot}%{_bindir}/quantum-openvswitch-agent
+install -p -D -m 755 bin/quantum-ovs-cleanup %{buildroot}%{_bindir}/quantum-ovs-cleanup
 install -p -D -m 755 bin/quantum-rootwrap %{buildroot}%{_bindir}/quantum-rootwrap
 install -p -D -m 755 bin/quantum-ryu-agent %{buildroot}%{_bindir}/quantum-ryu-agent
 install -p -D -m 755 bin/quantum-server %{buildroot}%{_bindir}/quantum-server
@@ -377,6 +378,7 @@ fi
 if [ $1 -eq 1 ] ; then
     # Initial installation
     /sbin/chkconfig --add quantum-openvswitch-agent
+    /sbin/chkconfig --add quantum-ovs-cleanup
 fi
 
 %preun -n openstack-quantum-openvswitch
@@ -384,6 +386,8 @@ if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /sbin/service quantum-openvswitch-agent stop >/dev/null 2>&1
     /sbin/chkconfig --del quantum-openvswitch-agent
+    /sbin/service quantum-ovs-cleanup stop >/dev/null 2>&1
+    /sbin/chkconfig --del quantum-ovs-cleanup
 fi
 
 %postun -n openstack-quantum-openvswitch
@@ -537,7 +541,7 @@ fi
 %{_initrddir}/quantum-openvswitch-agent
 %{_datadir}/quantum/quantum-openvswitch-agent.upstart
 %{_initrddir}/quantum-ovs-cleanup
-%{_datadir}/quantum-ovs-cleanup.upstart
+%{_datadir}/quantum/quantum-ovs-cleanup.upstart
 %{python_sitelib}/quantum/plugins/openvswitch
 %{_datarootdir}/quantum/rootwrap/openvswitch-plugin.filters
 %dir %{_sysconfdir}/quantum/plugins/openvswitch
@@ -667,4 +671,3 @@ fi
 
 * Fri Nov 18 2011 Robert Kukura <rkukura at redhat.com> - 2011.3-1
 - Initial package for Fedora
->>>>>>> origin/f18
diff --git a/quantum-ovs-cleanup.init b/quantum-ovs-cleanup.init
new file mode 100644
index 0000000..e2001a7
--- /dev/null
+++ b/quantum-ovs-cleanup.init
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# quantum-ovs-cleanup  OpenStack Open vSwitch cleanup utility
+#
+# chkconfig:   - 97 02
+# description: Purge Open vSwitch of the Quantum devices
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+proj=quantum
+prog=$proj-ovs-cleanup
+exec="/usr/bin/$prog"
+pidfile="/var/run/$proj/$prog.pid"
+config="/etc/$proj/plugins/openvswitch/ovs_quantum_plugin.ini"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+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
+    retval=$?
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+case "$1" in
+    start)
+        $1
+        ;;
+    stop|restart|reload|force-reload|status|condrestart|try-restart)
+        # Do nothing
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+exit $?
diff --git a/quantum-ovs-cleanup.upstart b/quantum-ovs-cleanup.upstart
new file mode 100644
index 0000000..e100eb2
--- /dev/null
+++ b/quantum-ovs-cleanup.upstart
@@ -0,0 +1,7 @@
+description "OpenStack Quantum Open vSwitch cleanup utility"
+
+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