Update to 8.0.0

Update spec for latest Mitaka release

DEB:
  * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0-0ubuntu1.dsc

RPM:
  * Source: https://github.com/openstack-packages/neutron-lbaas/blob/mitaka-rdo/openstack-neutron-lbaas.spec

Change-Id: If01a608fcd7404d7d3302182f5e85090e6ac02ab
(cherry picked from commit d79b85e7ad853d3c3088dec57a9f8f3038640a94)

diff --git a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
index 29e663a40263d781e4b9a46df78c612616eb8ada..7cba4ba898cc14b436a93c1ebf49153f5d44d5b4 100644 (file)
--- a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
+++ b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
@@ -1,10 +1,11 @@
 %global modulename neutron_lbaas
 %global servicename neutron-lbaas
 %global type LBaaS
+%global min_neutron_version 1:8.0.0
 
 Name:           openstack-%{servicename}
-Version:        8.0.0~b3
-Release:        1%{?dist}~mos1
+Version:        8.0.0
+Release:        2%{?dist}~mos1
 Epoch:          1
 Summary:        Openstack Networking %{type} plugin
 
@@ -16,8 +17,8 @@ Source2:        %{servicename}v2-agent.service
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
-BuildRequires:  python-barbicanclient
-BuildRequires:  python-neutron >= 1:%{version}
+BuildRequires:  python-barbicanclient >= 3.3.0
+BuildRequires:  python-neutron >= %{min_neutron_version}
 BuildRequires:  python-neutron-lib
 BuildRequires:  python-pbr
 BuildRequires:  python-pyasn1
@@ -29,8 +30,7 @@ BuildRequires:  git
 BuildRequires:  python-cryptography
 
 Requires:       python-%{servicename} = %{epoch}:%{version}-%{release}
-Requires:       openstack-neutron >= %{epoch}:%{version}
-Requires:       python-neutron-lib
+Requires:       openstack-neutron >= %{min_neutron_version}
 
 %description
 This is a %{type} service plugin for Openstack Neutron (Networking) service.
@@ -40,23 +40,10 @@ This is a %{type} service plugin for Openstack Neutron (Networking) service.
 Summary:        Neutron %{type} Python libraries
 Group:          Applications/System
 
-Requires:       python-neutron >= %{epoch}:%{version}
-Requires:       python-alembic >= 0.7.2
-Requires:       python-barbicanclient >= 3.0.1
-Requires:       python-eventlet
-Requires:       python-netaddr >= 0.7.12
-Requires:       python-oslo-config >= 2:1.9.3
-Requires:       python-oslo-db >= 1.7.0
-Requires:       python-oslo-log >= 1.0.0
-Requires:       python-oslo-messaging >= 1.8.0
-Requires:       python-oslo-serialization >= 1.4.0
-Requires:       python-oslo-utils >= 1.4.0
-Requires:       python-pbr
+Requires:       python-neutron >= %{min_neutron_version}
+Requires:       python-barbicanclient >= 3.3.0
 Requires:       python-pyasn1
 Requires:       python-pyasn1-modules
-Requires:       python-requests
-Requires:       python-six
-Requires:       python-sqlalchemy >= 0.9.7
 Requires:       pyOpenSSL
 
 
@@ -171,6 +158,10 @@ ln -s %{_sysconfdir}/neutron/%{modulename}.conf %{buildroot}%{_datadir}/neutron/
 
 
 %changelog
+* Mon Apr 11 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.0.0-2.el7
+- Update to upstream 8.0.0
+- Update requirements
+
 * Fri Mar 11 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.0.0~b3-1.el7
 - Update to upstream 8.0.0.0b3
 - Update requirements

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 45cdfec6c67a291e238395618d6081003f13feda..2cde0d6874c9a58b9398621dbf1a6da3b3885b81 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+neutron-lbaas (2:8.0.0-2~u14.04+mos1) mos9.0; urgency=medium
+
+  * Update to 8.0.0
+  * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0-0ubuntu1.dsc
+
+ -- Jerzy Mikolajczak <jmikolajczak@mirantis.com>  Mon, 11 Apr 2016 12:20:18 +0200
+
 neutron-lbaas (2:8.0.0~b3-1~u14.04+mos1) mos9.0; urgency=medium
 
   * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0~b3-0ubuntu1.dsc

diff --git a/trusty/debian/control b/trusty/debian/control
index 8fc5342939a16fd078e142ea4715334ed34e30fb..a3aef142a29d0f3fb68aad9da24bf91b44d2ca63 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -5,7 +5,7 @@ Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-              git,
+               git,
                openstack-pkg-tools (>= 23~),
                python-all,
                python-pbr (>= 1.8),
@@ -20,7 +20,7 @@ Build-Depends-Indep: alembic (>= 0.8.0),
                      python-keystoneauth1 (>= 2.1.0),
                      python-mock (>= 1.2),
                      python-netaddr (>= 0.7.12),
-                     python-neutron (>= 2:8.0.0~b3),
+                     python-neutron (>= 2:8.0.0),
                      python-neutron-lib (>= 0.0.1),
                      python-openssl (>= 0.14),
                      python-oslo.concurrency (>= 3.5.0),
@@ -35,12 +35,14 @@ Build-Depends-Indep: alembic (>= 0.8.0),
                      python-oslotest (>= 1:1.10.0),
                      python-pyasn1,
                      python-pyasn1-modules,
+                     python-pymysql,
                      python-requests (>= 2.8.1),
                      python-requests-mock (>= 0.7.0),
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
                      python-tempest-lib (>= 0.14.0),
+                     python-testresources (>= 0.2.4),
                      python-testscenarios (>= 0.4),
                      python-testtools (>= 1.4.0),
                      python-webob (>= 1.2.3),