Add breaks/replaces for upgrade over 8.4

Related JIRA ticket: PROD-11711
Related JIRA ticket: PROD-10903

Change-Id: Ie3fba7a13d352cdc45381f79ea5dcd189910d755

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 632c87755d76b08e7829b5db1d270ef37bc2c0f4..a0d58b4cc3a13971c5316ad6d0124f0efa676c6a 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2:10.0.2-2~u16.04+mcp0) mcp; urgency=medium
+
+  * Fix d/control to allow upgrade over 8.4
+
+ -- Dmitry Teselkin <mos-linux@mirantis.com>  Wed, 07 Jun 2017 17:58:50 +0300
+
 neutron (2:10.0.2-1~u16.04+mcp0) mcp; urgency=medium
 
   * Sync changes.

diff --git a/xenial/debian/control b/xenial/debian/control
index e3f313b866b2d917479c27a9d01dbc9c80910ea1..ac2a82c3b968a0f424b4dfa683cd80d42ac46cf0 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -82,6 +82,8 @@ Depends: adduser,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
+Breaks: neutron-common (<< 2:10.0),
+Replaces:neutron-common (<< 2:10.0),
 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
@@ -103,9 +105,9 @@ Depends: adduser,
          python-neutron-fwaas (>= 1:9.0.0~b3),
          ${misc:Depends},
          ${python:Depends}
-Breaks: neutron-l3-agent (<< 1:2014.1~rc2-1~),
+Breaks: neutron-l3-agent (<< 2:10.0),
         neutron-vpn-agent (<< 1:2014.1~rc2-1~),
-Replaces: neutron-l3-agent (<< 1:2014.1~rc2-1~),
+Replaces: neutron-l3-agent (<< 2:10.0),
           neutron-vpn-agent (<< 1:2014.1~rc2-1~),
 Description: Neutron is a virtual network service for Openstack - common
  Neutron is a virtual network service for Openstack, and a part of
@@ -131,6 +133,8 @@ Depends: conntrack,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
+Breaks:  neutron-common (<< 2:10.0),
+Replaces: neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - l3 agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -152,6 +156,8 @@ Depends: dnsmasq-base (>= 2.75),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
+Breaks: neutron-common (<< 2:10.0),
+Replaces: neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - DHCP agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -170,6 +176,8 @@ Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
+Breaks: neutron-common (<< 2:10.0)
+Replaces: neutron-common (<< 2:10.0)
 Description: Neutron is a virtual network service for Openstack - metadata agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -276,8 +284,10 @@ Depends: conntrack,
          ${shlibs:Depends}
 Breaks: neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
         neutron-plugin-openvswitch-agent ( << 2:8.0.0~b2-1~ ),
+        neutron-common (<< 2:10.0),
 Replaces: neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
           neutron-plugin-openvswitch-agent ( << 2:8.0.0~b2-1~ ),
+          neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -320,8 +330,10 @@ Depends: bridge-utils,
          ${shlibs:Depends}
 Breaks: neutron-plugin-linuxbirdge-agent ( << 2:8.0.0~b2-1~ ),
         neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
+        neutron-common (<< 2:10.0),
 Replaces: neutron-plugin-linuxbridge-agent ( << 2:8.0.0~b2-1~ ),
           neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
+          neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - linuxbridge agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -360,7 +372,9 @@ Depends: neutron-common (= ${source:Version}),
          ${python:Depends},
          ${shlibs:Depends}
 Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-1~ ),
+        neutron-common (<< 2:10.0),
 Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-1~ ),
+          neutron-common (<< 2:10.0),
 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
@@ -380,7 +394,9 @@ Depends: neutron-common (= ${source:Version}),
          ${python:Depends},
          ${shlibs:Depends}
 Breaks: neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
+        neutron-common (<< 2:10.0),
 Replaces: neutron-plugin-ml2 ( << 2:8.0.0~b2-1~ ),
+          neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - SR-IOV agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -418,6 +434,8 @@ Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
+Breaks: neutron-common (<< 2:10.0),
+Replaces: neutron-common (<< 2:10.0),
 Description: Neutron is a virtual network service for Openstack - Macvtap L2 Agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically