X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fcontrol;fp=debian%2Fcontrol;h=ce201112e9e1c5fb9c762c1eeee63e1123cbef5f;hb=4cca60531b51db68e6023ea6daa60cc33d277826;hp=fd783a9aecf12bf12df35963d67d6dd73138a5a3;hpb=3dea7869947d652cb9d069c3b9fcbd3f4c32ec3b;p=openstack-build%2Fneutron-build.git

diff --git a/debian/control b/debian/control
index fd783a9ae..ce201112e 100644
--- a/debian/control
+++ b/debian/control
@@ -631,7 +631,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:
@@ -639,7 +639,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
@@ -649,16 +651,39 @@ 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 - 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
+ 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 Mellanox plugin agent.
+
+Package: neutron-vpn-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ neutron-l3-agent (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
 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
@@ -671,13 +696,21 @@ Description: Neutron is a virtual network service for Openstack - VPN agent
  .
  This package provides the VPN agent.
 
-Package: neutron-plugin-metering-agent
+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}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
+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
@@ -690,6 +723,12 @@ Description: Neutron is a virtual network service for Openstack - metering agent
  .
  This package provides the metering agent.
 
+Package: neutron-plugin-metering-agent
+Architecture: all
+Depends: neutron-metering-agent, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
 Package: neutron-plugin-openflow-agent
 Architecture: all
 Depends:
@@ -748,3 +787,42 @@ Description: Neutron is a virtual network service for Openstack - IBM agent
  .
  This package provides the IBM agent.
 
+Package: neutron-plugin-oneconvergence
+Architecture: all
+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: neutron-plugin-oneconvergence-agent
+Architecture: all
+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.
+