Merge lp:~james-page/neutron/mlnx-plugin-split into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

Fixup splits for mlnx plugin packages

1) neutron-plugin-mlnx

Contains plugin configuration for use with neutron-server package

2) neutron-plugin-mlnx-agent

Agent package for use on compute nodes; depends on 1) for config.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-17 19:11:17 +0000
+++ debian/changelog	2014-03-18 12:28:32 +0000
@@ -1,7 +1,12 @@
 neutron (1:2014.1~b3-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * debian/rules: Run testr init before.
 
+  [ James Page ]
+  * d/control,neutron-mlnx-plugin{-agent}.install: Split out Mellanox
+    plugin configuration from agent package (LP: #1255420).
+
  -- Chuck Short <[e-mail]>  Mon, 17 Mar 2014 15:10:53 -0400
 
 neutron (1:2014.1~b3-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/control'
--- debian/control	2014-03-07 09:21:15 +0000
+++ debian/control	2014-03-18 12:28:32 +0000
@@ -631,15 +631,38 @@
  .
  This package provides the Midonet plugin.
 
+Package: neutron-plugin-mlnx
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+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
+ 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.
+
 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 - mlnx plugin agent
+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
@@ -649,7 +672,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the mlnx plugin agent.
+ This package provides the Mellanox plugin agent.
 
 Package: neutron-plugin-vpn-agent
 Architecture: all

=== modified file 'debian/neutron-plugin-mlnx-agent.install'
--- debian/neutron-plugin-mlnx-agent.install	2013-09-04 11:32:37 +0000
+++ debian/neutron-plugin-mlnx-agent.install	2014-03-18 12:28:32 +0000
@@ -1,2 +1,1 @@
-etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
 usr/bin/neutron-mlnx-agent usr/bin

=== added file 'debian/neutron-plugin-mlnx.install'
--- debian/neutron-plugin-mlnx.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-mlnx.install	2014-03-18 12:28:32 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx