Hi Julien (or anyone else in the release team)
Would it be possible for you to review the following proposed patch?
It solves the bug and it would be good to have that resolved for the
release.
It is a minimal fix for the problem.
Thanks in advance,
// Ola
On Tue, Nov 13, 2012 at 12:08:03PM +0100, Julien Cristau wrote:
> On Fri, Nov 9, 2012 at 05:03:58 +0800, Thomas Goirand wrote:
>
> > Please let me know if the attached patch would be accepted by the
> > release team and avoid Quantum to be removed.
> >
> Sigh. If you want to be sure it'll be accepted then just upload the
> minimal fix for the RC bug and leave it at that (2012.1-6 doesn't seem
> to list a bug number, so without more explanations it doesn't qualify).
> I'm not going to review every single one of your uploads 5 times.
>
> Cheers,
> Julien
--
--- Inguza Technology AB --- MSc in Information Technology ----
/ o...@inguza.com Annebergsslingan 37 \
| o...@debian.org 654 65 KARLSTAD |
| http://inguza.com/ Mobile: +46 (0)70-332 1551 |
\ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 /
---------------------------------------------------------------
diff -uNr quantum-2012.1-olaorig/debian/changelog quantum-2012.1/debian/changelog
--- quantum-2012.1-olaorig/debian/changelog 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/changelog 2012-12-29 08:50:07.943438606 +0000
@@ -1,3 +1,12 @@
+quantum (2012.1-5wheezy1) testing-proposed-updates; urgency=high
+
+ * Non-maintainer upload.
+ * Backport of "the removal of ryu app" from 2012.1-7. Closes: #685251.
+ This needs to go directly to testing as the changes in 2012.1-6 is
+ too excessive.
+
+ -- Ola Lundqvist <o...@debian.org> Sat, 29 Dec 2012 08:38:07 +0000
+
quantum (2012.1-5) unstable; urgency=low
* Really fix upgrade from version lt 2012.1-2. Closes: #672170
diff -uNr quantum-2012.1-olaorig/debian/control quantum-2012.1/debian/control
--- quantum-2012.1-olaorig/debian/control 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/control 2012-12-29 08:49:14.371441333 +0000
@@ -150,35 +150,6 @@
node
-Package: quantum-plugin-ryu
-Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, quantum-common,
- python-quantum
-Provides: quantum-plugin
-Conflicts: quantum-plugin
-Replaces: python-quantum (<< 2012.1-3)
-Breaks: python-quantum (<< 2012.1-3)
-Description: OpenStack Virtual network service - ryu plugin
- Quantum provides an API to dynamically request and configure virtual networks.
- These networks connect "interfaces" from other OpenStack services (e.g., vNICs
- from Nova VMs). The Quantum API supports extensions to provide advanced network
- capabilities (e.g., QoS, ACLs, network monitoring, etc).
- .
- This package provides a plugin to use with Ryu Network Operating Ssytem
-
-Package: quantum-plugin-ryu-agent
-Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
- python-quantum
-Description: OpenStack Virtual network service - ryu agent
- Quantum provides an API to dynamically request and configure virtual networks.
- These networks connect "interfaces" from other OpenStack services (e.g., vNICs
- from Nova VMs). The Quantum API supports extensions to provide advanced network
- capabilities (e.g., QoS, ACLs, network monitoring, etc).
- .
- This package provides the ryu-agent which should run on each compute
- node
-
Package: python-quantum
Architecture: all
Section: python
diff -uNr quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.init quantum-2012.1/debian/quantum-plugin-ryu-agent.init
--- quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.init 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-ryu-agent.init 1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: quantum-plugin-ryu-agent
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Quantum LinuxBridge Agent
-# Description: Agent to use within quantum ryu client
-### END INIT INFO
-
-# Author: Ghe Rivero <ghe.riv...@stackops.com>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Openstack Quantum LinuxBridge Plugin Agent"
-NAME=quantum-ryu-agent
-DAEMON=/usr/bin/quantum-ryu-agent
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-CONF_FILE=/etc/quantum/plugins/ryu/ryu_conf.ini
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
- start-stop-daemon --start --background --quiet --chuid root:root --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --background --quiet --chuid root:root --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
- $CONF_FILE \
- || return 2
-}
-
-do_stop()
-{
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff -uNr quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.install quantum-2012.1/debian/quantum-plugin-ryu-agent.install
--- quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.install 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-ryu-agent.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin/quantum-ryu-agent usr/bin
\ Ingen nyrad vid filslut
diff -uNr quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.manpages quantum-2012.1/debian/quantum-plugin-ryu-agent.manpages
--- quantum-2012.1-olaorig/debian/quantum-plugin-ryu-agent.manpages 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-ryu-agent.manpages 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/mans/quantum-ryu-agent.8
diff -uNr quantum-2012.1-olaorig/debian/quantum-plugin-ryu.install quantum-2012.1/debian/quantum-plugin-ryu.install
--- quantum-2012.1-olaorig/debian/quantum-plugin-ryu.install 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-ryu.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-etc/quantum/plugins/ryu
\ Ingen nyrad vid filslut
