On 11/08/2012 02:16 AM, Julien Cristau wrote:
> On Thu, Nov 8, 2012 at 01:50:31 +0800, Thomas Goirand wrote:
>
>> Now, I have to ask what the release team thinks about this. Should we
>> keep the ryu pluggin package in Debian, but disable the init script by
>> default, and explain the situation? Or simply remove all Ryu support?
>>
> If a package is not useful in the context of debian main then we should
> not ship it.
>
> Cheers,
> Julien
Here's the proposed patch which removes the RYU pluggins completely. The
debdiff between 2012.1-5 and proposed 2012.1-7 is attached.
I am the author only of the RYU plugin removal part of the patch. Other
changes shall be discussed with either Loic or Ola, who respectively
uploaded and modified the Quantum package in our Git. If the release
team wishes to revert some of it, let me know, and I'll do my best to
produce a new patch.
Please let me know if the attached patch would be accepted by the
release team and avoid Quantum to be removed.
Cheers,
Thomas
diff -Nru quantum-2012.1/debian/changelog quantum-2012.1/debian/changelog
--- quantum-2012.1/debian/changelog 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/changelog 2012-11-08 21:49:58.000000000 +0000
@@ -1,3 +1,26 @@
+quantum (2012.1-7) unstable; urgency=low
+
+ [ Thomas Goirand ]
+ * Removes ryu packages, since the ryu app isn't available in Debian main, and
+ as per discussed with the release team (Closes: #685251).
+
+ [ Loic Dachary ]
+ * Added the gbp.conf file which is otherwise present in other Openstack
+ packages.
+
+ -- Thomas Goirand <z...@debian.org> Thu, 08 Nov 2012 21:17:11 +0000
+
+quantum (2012.1-6) unstable; urgency=low
+
+ [ Ola Lundqvist ]
+ * Moved plugin files to the respective plugin package.
+ * The sample plugin is moved to usr/doc.
+ * Updated debian/rules to allow build two times in a row without
+ breaking.
+ * Removed useless Provides: / Breaks: / Conflicts: in debian/control.
+
+ -- Loic Dachary (OuoU) <l...@debian.org> Thu, 28 Jun 2012 08:12:57 +0200
+
quantum (2012.1-5) unstable; urgency=low
* Really fix upgrade from version lt 2012.1-2. Closes: #672170
diff -Nru quantum-2012.1/debian/control quantum-2012.1/debian/control
--- quantum-2012.1/debian/control 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/control 2012-11-08 21:49:58.000000000 +0000
@@ -44,10 +44,7 @@
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)
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - cisco plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -60,10 +57,7 @@
Architecture: all
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
quantum-common, openvswitch-switch,
python-quantum
-Provides: quantum-plugin
-Conflicts: quantum-plugin
-Replaces: python-quantum (<< 2012.1-3)
-Breaks: python-quantum (<< 2012.1-3)
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - openvswitch plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -76,10 +70,7 @@
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)
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - sample plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -92,10 +83,7 @@
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)
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - nicira NVP plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -109,10 +97,7 @@
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, quantum-common,
bridge-utils,
python-quantum
-Provides: quantum-plugin
-Conflicts: quantum-plugin
-Replaces: python-quantum (<< 2012.1-3)
-Breaks: python-quantum (<< 2012.1-3)
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - linux bridge plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -126,6 +111,7 @@
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
openvswitch-switch, quantum-plugin-openvswitch,
python-quantum
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - openvswitch agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -140,6 +126,7 @@
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
bridge-utils,
python-quantum
+Replaces: python-quantum (<< 2012.1-5.1)
Description: OpenStack Virtual network service - linuxbridge agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (e.g., vNICs
@@ -149,36 +136,6 @@
This package provides the linuxbridge-agent which should run on each compute
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
@@ -194,8 +151,6 @@
python-webob,
python-quantumclient
Provides: ${python:Provides}
-Replaces: quantum-server (<< 2012.1-3), quantum-plugin-cisco (<< 2012.1-3),
quantum-plugin-linuxbridge (<< 2012.1-3), quantum-plugin-nicira (<< 2012.1-3),
quantum-plugin-openvswitch (<< 2012.1-3), quantum-plugin-ryu (<< 2012.1-3),
quantum-plugin-sample (<< 2012.1-3)
-Breaks: quantum-server (<< 2012.1-3), quantum-plugin-cisco (<< 2012.1-3),
quantum-plugin-linuxbridge (<< 2012.1-3), quantum-plugin-nicira (<< 2012.1-3),
quantum-plugin-openvswitch (<< 2012.1-3), quantum-plugin-ryu (<< 2012.1-3),
quantum-plugin-sample (<< 2012.1-3)
Description: Quantum is a virutal network service for Openstack. (python
library)
Quantum is a virtual network service for Openstack, and a part of
Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -207,4 +162,3 @@
etc.)
.
This package provides the Python library.
-
diff -Nru quantum-2012.1/debian/gbp.conf quantum-2012.1/debian/gbp.conf
--- quantum-2012.1/debian/gbp.conf 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/gbp.conf 2012-11-08 21:49:58.000000000 +0000
@@ -2,6 +2,7 @@
upstream-branch = master
debian-branch = debian/unstable
upstream-tag = %(version)s
+compression = xz
[git-buildpackage]
export-dir = ../build-area/
diff -Nru quantum-2012.1/debian/python-quantum.install
quantum-2012.1/debian/python-quantum.install
--- quantum-2012.1/debian/python-quantum.install 2012-06-12
18:15:41.000000000 +0000
+++ quantum-2012.1/debian/python-quantum.install 2012-11-08
21:49:58.000000000 +0000
@@ -1 +1,9 @@
-usr/lib/python*/dist-packages/quantum*
\ No newline at end of file
+usr/lib/python*/dist-packages/quantum/*.py
+usr/lib/python*/dist-packages/quantum/server
+usr/lib/python*/dist-packages/quantum/db
+usr/lib/python*/dist-packages/quantum/api
+usr/lib/python*/dist-packages/quantum/extensions
+usr/lib/python*/dist-packages/quantum/plugins/__init__.py
+usr/lib/python*/dist-packages/quantum/openstack
+usr/lib/python*/dist-packages/quantum/rootwrap
+usr/lib/python*/dist-packages/quantum*.egg-info
diff -Nru quantum-2012.1/debian/quantum-plugin-cisco.install
quantum-2012.1/debian/quantum-plugin-cisco.install
--- quantum-2012.1/debian/quantum-plugin-cisco.install 2012-06-12
18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-cisco.install 2012-11-08
21:49:58.000000000 +0000
@@ -1 +1,2 @@
etc/quantum/plugins/cisco/*.ini etc/quantum/plugins/cisco
+usr/lib/python2.*/dist-packages/quantum/plugins/cisco
diff -Nru quantum-2012.1/debian/quantum-plugin-linuxbridge-agent.install
quantum-2012.1/debian/quantum-plugin-linuxbridge-agent.install
--- quantum-2012.1/debian/quantum-plugin-linuxbridge-agent.install
2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-linuxbridge-agent.install
2012-11-08 21:49:58.000000000 +0000
@@ -1 +1,2 @@
-bin/quantum-linuxbridge-agent usr/bin
\ No newline at end of file
+bin/quantum-linuxbridge-agent usr/bin
+usr/lib/python2.*/dist-packages/quantum/plugins/linuxbridge/agent
diff -Nru quantum-2012.1/debian/quantum-plugin-linuxbridge.install
quantum-2012.1/debian/quantum-plugin-linuxbridge.install
--- quantum-2012.1/debian/quantum-plugin-linuxbridge.install 2012-06-12
18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-linuxbridge.install 2012-11-08
21:49:58.000000000 +0000
@@ -1 +1,4 @@
-etc/quantum/plugins/linuxbridge
\ No newline at end of file
+etc/quantum/plugins/linuxbridge
+usr/lib/python2.*/dist-packages/quantum/plugins/linuxbridge/*.py
+usr/lib/python2.*/dist-packages/quantum/plugins/linuxbridge/common
+usr/lib/python2.*/dist-packages/quantum/plugins/linuxbridge/db
diff -Nru quantum-2012.1/debian/quantum-plugin-nicira.install
quantum-2012.1/debian/quantum-plugin-nicira.install
--- quantum-2012.1/debian/quantum-plugin-nicira.install 2012-06-12
18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-nicira.install 2012-11-08
21:49:58.000000000 +0000
@@ -1 +1,2 @@
-etc/quantum/plugins/nicira
\ No newline at end of file
+etc/quantum/plugins/nicira
+usr/lib/python2.*/dist-packages/quantum/plugins/nicira
diff -Nru quantum-2012.1/debian/quantum-plugin-openvswitch-agent.install
quantum-2012.1/debian/quantum-plugin-openvswitch-agent.install
--- quantum-2012.1/debian/quantum-plugin-openvswitch-agent.install
2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-openvswitch-agent.install
2012-11-08 21:49:58.000000000 +0000
@@ -1 +1,2 @@
-bin/quantum-openvswitch-agent usr/bin
\ No newline at end of file
+bin/quantum-openvswitch-agent usr/bin
+usr/lib/python2.*/dist-packages/quantum/plugins/openvswitch/agent
diff -Nru quantum-2012.1/debian/quantum-plugin-openvswitch.install
quantum-2012.1/debian/quantum-plugin-openvswitch.install
--- quantum-2012.1/debian/quantum-plugin-openvswitch.install 2012-06-12
18:15:41.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-openvswitch.install 2012-11-08
21:49:58.000000000 +0000
@@ -1 +1,2 @@
etc/quantum/plugins/openvswitch
+usr/lib/python2.*/dist-packages/quantum/plugins/openvswitch/*.py
diff -Nru quantum-2012.1/debian/quantum-plugin-ryu-agent.init
quantum-2012.1/debian/quantum-plugin-ryu-agent.init
--- quantum-2012.1/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 -Nru quantum-2012.1/debian/quantum-plugin-ryu-agent.install
quantum-2012.1/debian/quantum-plugin-ryu-agent.install
--- quantum-2012.1/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
\ No newline at end of file
diff -Nru quantum-2012.1/debian/quantum-plugin-ryu-agent.manpages
quantum-2012.1/debian/quantum-plugin-ryu-agent.manpages
--- quantum-2012.1/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 -Nru quantum-2012.1/debian/quantum-plugin-ryu.install
quantum-2012.1/debian/quantum-plugin-ryu.install
--- quantum-2012.1/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
\ No newline at end of file
diff -Nru quantum-2012.1/debian/quantum-plugin-sample.install
quantum-2012.1/debian/quantum-plugin-sample.install
--- quantum-2012.1/debian/quantum-plugin-sample.install 1970-01-01
00:00:00.000000000 +0000
+++ quantum-2012.1/debian/quantum-plugin-sample.install 2012-11-08
21:49:58.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/python2.*/dist-packages/quantum/plugins/sample
usr/share/doc/quantum-plugin-sample/sample-module
diff -Nru quantum-2012.1/debian/rules quantum-2012.1/debian/rules
--- quantum-2012.1/debian/rules 2012-06-12 18:15:41.000000000 +0000
+++ quantum-2012.1/debian/rules 2012-11-08 21:49:58.000000000 +0000
@@ -14,5 +14,7 @@
dh_installinit --remaining-packages
override_dh_auto_clean:
+ find . -type f -name "*.pyc" | xargs rm -fr
+ rm -rf build quantum.egg-info
-override_dh_auto_build:
\ No newline at end of file
+override_dh_auto_build:
