X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fcontrol;h=33b108e7c9e5d93c3187c3048a15461e9157ef04;hb=4325c38266e8023e849f93d625056726dc0a9b31;hp=51d4a1d1722dc28af856f1a5e0441daba618b1fc;hpb=2e54cf4522cf61999e74de5c10eebed212aa7e53;p=openstack-build%2Fneutron-build.git diff --git a/debian/control b/debian/control index 51d4a1d17..33b108e7c 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends-Indep: python-httplib2, python-iso8601, python-jinja2, + python-jsonrpclib, python-keystoneclient (>= 1:0.2.0), python-kombu (>= 2.5.12), python-lxml, @@ -31,6 +32,7 @@ Build-Depends-Indep: python-paste, python-pastedeploy, python-pbr (>= 0.5.21), + python-psutil (>= 0.6.1), python-pyudev, python-requests (>= 1.1), python-routes, @@ -46,8 +48,8 @@ Build-Depends-Indep: testrepository ( >= 0.0.17) XS-Python-Version: >= 2.6 Standards-Version: 3.9.4 -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/havana/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/havana +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/icehouse/files +Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/icehouse XS-Testsuite: autopkgtest Package: neutron-server @@ -58,9 +60,9 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) -Recommends: neutron-plugin-openvswitch +Breaks: quantum-server (<< 1:2013.2~b2-0ubuntu1~) +Replaces: quantum-server (<< 1:2013.2~b2-0ubuntu1~) +Recommends: neutron-plugin-ml2 Description: Neutron is a virtual network service for Openstack - server Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -80,8 +82,14 @@ Depends: python-neutron (= ${source:Version}), ${misc:Depends}, ${python:Depends} -Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Breaks: + neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~), + neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~), + quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: + neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~), + neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~), + quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) Description: Neutron is a virtual network service for Openstack - common Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -183,6 +191,25 @@ Description: Neutron is a virtual network service for Openstack - BigSwitch plug . This package provides the BigSwitch plugin. +Package: neutron-plugin-bigswitch-agent +Architecture: all +Depends: + neutron-plugin-bigswitch (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - BigSwitch plugin agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the BigSwitch plugin agent. + Package: neutron-plugin-hyperv Architecture: all Provides: neutron-plugin @@ -271,7 +298,7 @@ Description: Neutron is a virtual network service for Openstack - Metaplugin plu . This package provides the Metaplugin plugin. -Package: neutron-plugin-nicira +Package: neutron-plugin-vmware Architecture: all Provides: neutron-plugin Depends: @@ -279,9 +306,9 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) -Description: Neutron is a virtual network service for Openstack - Nicira plugin +Breaks: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ ) +Replaces: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ ) +Description: Neutron is a virtual network service for Openstack - VMware plugin Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically request and configure virtual servers, Neutron provides an API to @@ -291,7 +318,16 @@ Description: Neutron is a virtual network service for Openstack - Nicira plugin advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the Nicira NVP plugin + This package provides the VMware NSX plugin + +Package: neutron-plugin-nicira +Depends: neutron-plugin-vmware, ${misc:Depends} +Architecture: all +Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. Package: neutron-l3-agent Architecture: all @@ -403,6 +439,7 @@ Depends: python-oslo.config (>= 1:1.2.0a3), python-paste, python-pastedeploy, + python-psutil (>= 0.6.1), python-requests (>= 1.1), python-routes, python-six, @@ -472,8 +509,7 @@ Description: Neutron is a virtual network service for Openstack - ML2 plugin Package: neutron-plugin-openvswitch-agent Architecture: all Depends: - neutron-common (= ${source:Version}), - neutron-plugin-ml2, + neutron-plugin-ml2 (= ${source:Version}), openvswitch-switch, ${misc:Depends}, ${python:Depends}, @@ -518,8 +554,7 @@ Package: neutron-plugin-linuxbridge-agent Architecture: all Depends: bridge-utils, - neutron-common (= ${source:Version}), - neutron-plugin-linuxbridge, + neutron-plugin-linuxbridge (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -562,8 +597,7 @@ Description: Neutron is a virtual network service for Openstack - RYU plugin Package: neutron-plugin-ryu-agent Architecture: all Depends: - neutron-common (= ${source:Version}), - neutron-plugin-ryu, + neutron-plugin-ryu (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -603,7 +637,7 @@ Description: Neutron is a virtual network service for Openstack - Midonet plugin . This package provides the Midonet plugin. -Package: neutron-plugin-mlnx-agent +Package: neutron-plugin-mlnx Architecture: all Provides: neutron-plugin Depends: @@ -611,7 +645,9 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - mlnx plugin agent +Breaks: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Replaces: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Description: Neutron is a virtual network service for Openstack - Mellanox plugin Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically request and configure virtual servers, Neutron provides an API to @@ -621,17 +657,18 @@ Description: Neutron is a virtual network service for Openstack - mlnx plugin ag advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the mlnx plugin agent. + This package provides the Mellanox plugin. -Package: neutron-plugin-vpn-agent +Package: neutron-plugin-mlnx-agent Architecture: all Provides: neutron-plugin Depends: neutron-common (= ${source:Version}), + neutron-plugin-mlnx, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - vpn plugin +Description: Neutron is a virtual network service for Openstack - Mellanox plugin agent Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically request and configure virtual servers, Neutron provides an API to @@ -641,17 +678,21 @@ Description: Neutron is a virtual network service for Openstack - vpn plugin advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the vpn plugin. + This package provides the Mellanox plugin agent. -Package: neutron-plugin-metering-agent +Package: neutron-vpn-agent Architecture: all -Provides: neutron-plugin Depends: + iputils-arping, neutron-common (= ${source:Version}), + neutron-metadata-agent (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - metering plugin +Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Conflicts: neutron-l3-agent +Description: Neutron is a virtual network service for Openstack - VPN agent Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically request and configure virtual servers, Neutron provides an API to @@ -661,177 +702,134 @@ Description: Neutron is a virtual network service for Openstack - metering plugi advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the metering plugin. + This package provides the VPN agent, which also provides L3 agent support. -Package: neutron-ovs-cleanup +Package: neutron-plugin-vpn-agent +Architecture: all +Depends: neutron-vpn-agent, ${misc:Depends} +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: neutron-metering-agent Architecture: all Depends: neutron-common (= ${source:Version}), - neutron-plugin-openvswitch (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ ) -Description: This package provides OVS cleanup upstart script. - -Package: quantum-server -Depends: neutron-server, ${misc:Depends} -Architecture: all -Section: oldlibs -description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-common -Depends: neutron-common, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-cisco -Depends: neutron-plugin-cisco, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-nec -Depends: neutron-plugin-nec, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-nec-agent -Depends: neutron-plugin-nec-agent, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-bigswitch -Depends: neutron-plugin-bigswitch, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-hyperv -Depends: neutron-plugin-hyperv, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-brocade -Depends: neutron-plugin-brocade, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-plumgrid -Depends: neutron-plugin-plumgrid, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-metaplugin -Depends: neutron-plugin-metaplugin, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-nicira -Depends: neutron-plugin-nicira, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-l3-agent -Depends: neutron-l3-agent, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-dhcp-agent -Depends: neutron-dhcp-agent, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-metadata-agent -Depends: neutron-metadata-agent, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-lbaas-agent -Depends: neutron-lbaas-agent, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: python-quantum -Depends: python-neutron, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: quantum-plugin-openvswitch -Depends: neutron-plugin-openvswitch, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Description: Neutron is a virtual network service for Openstack - metering agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the metering agent. -Package: quantum-plugin-openvswitch-agent -Depends: neutron-plugin-openvswitch-agent, ${misc:Depends} +Package: neutron-plugin-metering-agent Architecture: all -Section: oldlibs +Depends: neutron-metering-agent, ${misc:Depends} Description: transitional dummy package This is a transitional dummy package. It can safely be removed. -Package: quantum-plugin-linuxbridge -Depends: neutron-plugin-linuxbridge, ${misc:Depends} +Package: neutron-plugin-openflow-agent Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Depends: + neutron-plugin-ml2 (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - Openflow agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the Openflow agent. -Package: quantum-plugin-linuxbridge-agent -Depends: neutron-plugin-linuxbridge-agent, ${misc:Depends} +Package: neutron-plugin-ibm Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Provides: neutron-plugin +Depends: + neutron-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - IBM SDN plugin + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the IBM SDN plugin. -Package: quantum-plugin-ryu -Depends: neutron-plugin-ryu, ${misc:Depends} +Package: neutron-plugin-ibm-agent Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Depends: + neutron-plugin-ibm (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - IBM agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the IBM agent. -Package: quantum-plugin-ryu-agent -Depends: neutron-plugin-ryu-agent, ${misc:Depends} +Package: neutron-plugin-oneconvergence Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Provides: neutron-plugin +Depends: + neutron-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - One Convergence plugin + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the One Convergence plugin. -Package: quantum-plugin-midonet -Depends: neutron-plugin-midonet, ${misc:Depends} +Package: neutron-plugin-oneconvergence-agent Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Depends: + neutron-plugin-oneconvergence (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - One Convergence agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the One Convergence agent.