From f1369f6c05a662a900754a6cc228fde023b04b94 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 6 Aug 2013 17:22:53 +0200 Subject: [PATCH] Added a bunch of provides for the removed pluggins packages. --- debian/control | 36 +++++++++++++++++++++++++++++------ debian/neutron-common.install | 6 +++--- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index f2b96a54c..3effe550c 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), po-debconf, python-all (>= 2.6), python-d2to1 (>= 0.2.10), - python-pbr, + python-pbr Build-Depends-Indep: alembic (>= 0.4.1), bridge-utils, pep8 (>= 1.3.3), @@ -37,6 +37,7 @@ Build-Depends-Indep: alembic (>= 0.4.1), python-mox, python-netaddr, python-netifaces, + python-neutronclient (>= 2.2.0), python-nose, python-nosexcover, python-novaclient, @@ -44,7 +45,6 @@ Build-Depends-Indep: alembic (>= 0.4.1), python-paste, python-pastedeploy, python-pyudev, - python-neutronclient (>= 2.2.0), python-routes, python-setuptools, python-setuptools-git, @@ -113,13 +113,13 @@ Depends: alembic (>= 0.4.1), python-lxml, python-migrate, python-netaddr, + python-neutronclient (>= 2.2.0), python-novaclient, python-oslo.config, python-paste, python-pastedeploy, python-pbr, python-pyudev, - python-neutronclient (>= 2.2.0), python-routes, python-simplejson, python-six, @@ -162,11 +162,35 @@ Depends: adduser, debconf, python-cliff, python-mysqldb, - python-pyparsing (>=1.5.7), python-neutron (= ${source:Version}), + python-pyparsing (>=1.5.7), python-sqlalchemy, ${misc:Depends}, ${python:Depends} +Provides: neutron-plugin, + neutron-plugin-bigswitch, + neutron-plugin-brocade, + neutron-plugin-cisco, + neutron-plugin-hyperv, + neutron-plugin-linuxbridge, + neutron-plugin-metaplugin, + neutron-plugin-nec, + neutron-plugin-nicira, + neutron-plugin-openvswitch, + neutron-plugin-plumgrid, + neutron-plugin-ryu, + quantum-plugin, + quantum-plugin-bigswitch, + quantum-plugin-brocade, + quantum-plugin-cisco, + quantum-plugin-hyperv, + quantum-plugin-linuxbridge, + quantum-plugin-metaplugin, + quantum-plugin-nec, + quantum-plugin-nicira, + quantum-plugin-openvswitch, + quantum-plugin-plumgrid, + quantum-plugin-ryu Breaks: quantum-plugin-linuxbridge-agent, quantum-plugin-openvswitch-agent, quantum-server (<= 2013.1) @@ -278,8 +302,8 @@ Description: OpenStack virtual network service - LBaaS agent Package: neutron-plugin-openvswitch-agent Architecture: all Pre-Depends: dpkg (>= 1.15.6~), openvswitch-switch -Depends: openvswitch-switch, - neutron-common (= ${source:Version}), +Depends: neutron-common (= ${source:Version}), + openvswitch-switch, sudo, ${misc:Depends}, ${python:Depends}, diff --git a/debian/neutron-common.install b/debian/neutron-common.install index 67b8b1e68..74b4f14b0 100644 --- a/debian/neutron-common.install +++ b/debian/neutron-common.install @@ -1,8 +1,8 @@ -usr/bin/neutron* debian/neutron_sudoers /etc/sudoers.d etc/api-paste.ini /usr/share/neutron-common -etc/policy.json /etc/neutron etc/neutron.conf /usr/share/neutron-common +etc/neutron/plugins /etc/neutron etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d +etc/policy.json /etc/neutron etc/rootwrap.conf /etc/neutron -etc/neutron/plugins /etc/neutron +usr/bin/neutron* -- 2.45.2