[openstack-quantum/el6-grizzly: 7/7] Add upstart/init stuff for metadata/ovs-cleanup
Terry Wilson
otherwiseguy at fedoraproject.org
Thu Feb 28 16:14:36 UTC 2013
commit eb61b1aca460681bfffc4637ad683a35b2ddaeba
Author: Terry Wilson <twilson at redhat.com>
Date: Wed Feb 27 16:39:52 2013 -0600
Add upstart/init stuff for metadata/ovs-cleanup
openstack-quantum.spec | 8 ++--
quantum-metadata-agent.init | 94 ++++++++++++++++++++++++++++++++++++++++
quantum-metadata-agent.service | 12 -----
quantum-metadata-agent.upstart | 9 ++++
quantum-ovs-cleanup.init | 41 +++++++++++++++++
quantum-ovs-cleanup.service | 13 ------
quantum-ovs-cleanup.upstart | 7 +++
7 files changed, 155 insertions(+), 29 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index ea811d1..8a7520b 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -745,7 +745,7 @@ fi
- Require compatible version of python-sqlalchemy
- Various spec file improvements
-* Thu Feb 15 2013 Robert Kukura <rkukura at redhat.com> - 2013.1-0.3.g2
+* Fri Feb 15 2013 Robert Kukura <rkukura at redhat.com> - 2013.1-0.3.g2
- Update to grizzly milestone 2
- Add quantum-db-manage, quantum-metadata-agent,
quantum-ns-metadata-proxy, quantum-ovs-cleanup, and
@@ -760,6 +760,9 @@ fi
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.2.g1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 2012.2.1-1
+- Added python-keystone requirement
+
* Wed Dec 5 2012 Robert Kukura <rkukura at redhat.com> - 2013.1-0.1.g1
- Update to grizzly milestone 1
- Require python-quantumclient >= 1:2.1.10
@@ -767,9 +770,6 @@ fi
- Add bigswitch plugin as sub-package
- Work around bigswitch conf file missing from setup.py
-* Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 2012.2.1-1
-- Added python-keystone requirement
-
* Mon Dec 3 2012 Robert Kukura <rkukura at redhat.com> - 2012.2.1-1
- Update to folsom stable 2012.2.1
- Add upstream patch: Fix rpc control_exchange regression.
diff --git a/quantum-metadata-agent.init b/quantum-metadata-agent.init
new file mode 100644
index 0000000..e6f146f
--- /dev/null
+++ b/quantum-metadata-agent.init
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# quantum-metadata-agent OpenStack Quantum Metadata Agent
+#
+# chkconfig: - 98 02
+# description: OpenStack Quantum Metadata Agent
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+proj=quantum
+plugin=metadata-agent
+prog=$proj-$plugin
+exec="/usr/bin/$prog"
+config="/etc/$proj/metadata_agent.ini"
+pidfile="/var/run/$proj/$prog.pid"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user quantum --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/quantum-metadata-agent.upstart b/quantum-metadata-agent.upstart
new file mode 100644
index 0000000..c11261b
--- /dev/null
+++ b/quantum-metadata-agent.upstart
@@ -0,0 +1,9 @@
+description "OpenStack Quantum Layer 3 Agent"
+description "OpenStack Quantum Metadata Agent"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/quantum-metadata-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/metadata_agent.ini --log-file /var/log/quantum/metadata-agent.log" quantum
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
More information about the scm-commits
mailing list