From ec6bad2cd958c4f2593abebf18170db6ba4e3c37 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Fri, 14 Apr 2017 00:49:42 +0300 Subject: [PATCH] [MOS 11.0][DEB] Update neutron-lbaas package Version: 2:10.0.0-1~u16.04+mos0 Fix (build-)dependencies. Repotest-Exclude: neutron-lbaas-agent neutron-plugin-nec-agent Related-PROD: https://mirantis.jira.com/browse/PROD-8505 Change-Id: Icd8d705fc91879b234c5534fe06257506f4c93cf --- xenial/debian/changelog | 286 ++++++++++++++++---- xenial/debian/control | 172 +++++------- xenial/debian/copyright | 44 +-- xenial/debian/gbp.conf | 8 - xenial/debian/neutron-lbaas-agent.init.in | 23 -- xenial/debian/neutron-lbaas-common.install | 3 +- xenial/debian/neutron-lbaasv2-agent.init.in | 5 +- xenial/debian/neutron-lbaasv2-agent.install | 1 + xenial/debian/pydist-overrides | 1 + xenial/debian/python-neutron-lbaas.install | 3 +- xenial/debian/rules | 55 ++-- 11 files changed, 355 insertions(+), 246 deletions(-) delete mode 100644 xenial/debian/gbp.conf delete mode 100644 xenial/debian/neutron-lbaas-agent.init.in create mode 100644 xenial/debian/neutron-lbaasv2-agent.install create mode 100644 xenial/debian/pydist-overrides diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 3da686b..e536937 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,87 +1,271 @@ -neutron-lbaas (2:9.0.0~b2-2~u16.04+mos1) mos10; urgency=medium +neutron-lbaas (2:10.0.0-1~u16.04+mos0) mos11.0; urgency=medium - * Update requirements + * Fix (build-)dependencies. - -- Jerzy Mikolajczak Fri, 19 Aug 2016 10:36:43 +0200 + -- Ivan Udovichenko Wed, 12 Apr 2017 18:16:05 +0300 -neutron-lbaas (2:9.0.0~b2-1~u16.04+mos1) mos10.0; urgency=medium +neutron-lbaas (2:10.0.0-0ubuntu2~cloud0) xenial-ocata; urgency=medium - * Update to new upstram relese Newton b2 - * Update requirements based on project requirements - * Source: http://anonscm.debian.org/git/openstack/neutron-lbaas.git/?h=debian%2Fnewton + * New update for the Ubuntu Cloud Archive. - -- Jerzy Mikolajczak Thu, 21 Jul 2016 17:45:51 +0200 + -- Openstack Ubuntu Testing Bot Mon, 27 Mar 2017 20:54:57 +0000 -neutron-lbaas (2:9.0.0~b1-1~u16.04+mos1) mos10.0; urgency=medium +neutron-lbaas (2:10.0.0-0ubuntu2) zesty; urgency=medium - * Update requirements based on project requirements - * Source: http://anonscm.debian.org/git/openstack/neutron-lbaas.git/?h=debian%2Fnewton + * debian/neutron-lbaas-common.install: Remove cron jobs since + it will cause a race with L3 agents and neutron. (LP: #1623664) + * d/control: Remove duplicate depenendency. - -- Jerzy Mikolajczak Thu, 30 Jun 2016 13:07:02 +0200 + -- Chuck Short Mon, 27 Mar 2017 13:04:16 -0400 -neutron-lbaas (2:8.0.0-1~u14.04+mos1) mos9.0; urgency=medium +neutron-lbaas (2:10.0.0-0ubuntu1) zesty; 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 + * New upstream release for OpenStack Ocata. - -- Jerzy Mikolajczak Mon, 11 Apr 2016 12:20:18 +0200 + -- Corey Bryant Wed, 22 Feb 2017 10:27:28 -0500 -neutron-lbaas (2:8.0.0~b3-1~u14.04+mos1) mos9.0; urgency=medium +neutron-lbaas (2:10.0.0~rc1-0ubuntu1) zesty; urgency=medium - * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0~b3-0ubuntu1.dsc + * New upstream milestone for Ocata. - -- Jerzy Mikolajczak Tue, 15 Mar 2016 08:51:24 +0100 + -- Chuck Short Mon, 06 Feb 2017 12:31:35 -0500 -neutron-lbaas (2:8.0.0~b2-1~u14.04+mos1) mos9.0; urgency=medium +neutron-lbaas (2:10.0.0~b3-0ubuntu1) zesty; urgency=medium - * Source [0] - [0] http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0~b1-0ubuntu2.dsc + * New upstream release. + * d/control: Align (Build-)Depends with upstream. - -- Jerzy Mikolajczak Wed, 20 Jan 2016 12:47:15 +0100 + -- Chuck Short Mon, 30 Jan 2017 08:19:53 -0500 -neutron-lbaas (2:7.0.0.0b2-1~u14.04+mos1) mos8.0; urgency=medium +neutron-lbaas (2:10.0.0~b2-0ubuntu1) zesty; urgency=medium - * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_7.0.0-0ubuntu1.dsc + [ Chuck Short ] + * debian/rules: Add PBR_VERSION to set correct version for + package builds. - -- Sergey Kolekonov Tue, 20 Oct 2015 19:21:05 +0300 + [ Corey Bryant ] + * New upstream milestone for OpenStack Ocata. + * d/control: Align (Build-)Depends with upstream. -neutron-lbaas (1:2015.1.1-1~u14.04+mos1) mos7.0; urgency=medium + -- Corey Bryant Mon, 19 Dec 2016 07:57:09 -0500 - * Bump version to 2015.1.1 according to the latest tag +neutron-lbaas (2:10.0.0~b1-0ubuntu1) zesty; urgency=medium - -- Sergey Kolekonov Fri, 14 Aug 2015 14:36:10 +0300 + * New upstream milestone for OpenStack Ocata. + * d/control: Align (build-)depends with upstream. -neutron-lbaas (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium + -- David Della Vecchia Thu, 17 Nov 2016 08:51:22 -0500 + +neutron-lbaas (2:9.0.0-0ubuntu1) yakkety; urgency=medium + + * d/control: oslo.log min version level in global-requirements is too low, + so set min version to upper-constraints level (LP: #1628883). + * New upstream release for OpenStack Newton. + * d/control: Align python-neutron with Newton final release. + + -- Corey Bryant Thu, 06 Oct 2016 15:59:04 -0400 + +neutron-lbaas (2:9.0.0~rc2-0ubuntu1) yakkety; urgency=medium + + * New upstream release candidate for OpenStack Newton. + + -- Corey Bryant Wed, 28 Sep 2016 13:52:01 -0400 + +neutron-lbaas (2:9.0.0~rc1-0ubuntu1) yakkety; urgency=medium + + * New upstream release candidate for OpenStack Newton. + + -- James Page Mon, 19 Sep 2016 11:59:42 +0100 + +neutron-lbaas (2:9.0.0~b3-0ubuntu1) yakkety; urgency=medium + + [ James Page ] + * New upstream release. + * d/control,neutron-lbaas-agent.*: Drop v1 agent package as v1 has now + been removed from upstream. + + [ David Della Vecchia ] + * New upstream milestone for OpenStack Newton. + * d/control: Align (build-)depends with upstream. + + -- David Della Vecchia Fri, 02 Sep 2016 08:36:55 -0400 + +neutron-lbaas (2:9.0.0~b2-0ubuntu1) yakkety; urgency=medium + + * New upstream milestone for OpenStack Newton. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Thu, 14 Jul 2016 14:03:26 -0400 + +neutron-lbaas (2:9.0.0~b1-0ubuntu1) yakkety; urgency=medium + + * New upstream milestone for OpenStack Newton. + * d/control: Align (Build-)Depends with upstream. + + -- David Della Vecchia Mon, 06 Jun 2016 17:08:51 -0400 + +neutron-lbaas (2:8.0.0-0ubuntu1) xenial; urgency=medium + + * New upstream release for OpenStack Mitaka. + * d/control: Set min python-neutron BD to 2:8.0.0. + + -- Corey Bryant Thu, 07 Apr 2016 15:55:37 -0400 + +neutron-lbaas (2:8.0.0~rc1-0ubuntu1) xenial; urgency=medium + + * New upstream release candidate for OpenStack Mitaka. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Thu, 24 Mar 2016 09:40:37 -0400 + +neutron-lbaas (2:8.0.0~b3-0ubuntu1) xenial; urgency=medium + + * New upstream milestone for OpenStack Mitaka. + * d/control: Align (Build-)Depends with upstream. + * d/p/skip-failing-tests.patch: Rebased. + + -- Corey Bryant Tue, 08 Mar 2016 14:46:12 -0500 + +neutron-lbaas (2:8.0.0~b2-0ubuntu1) xenial; urgency=medium + + * New upstream milestone for OpenStack Mitaka. + * d/control: Align (build-)depends with upstream. + * d/p/skip-failing-tests.patch: Rebased. + * d/rules: Generate config files with generate_config_file_samples.sh. + + -- Corey Bryant Wed, 27 Jan 2016 10:36:21 +0100 + +neutron-lbaas (2:8.0.0~b1-0ubuntu2) xenial; urgency=medium + + * No change rebuild with neutron 8.0.0~b1-0ubuntu1. + + -- Corey Bryant Sun, 20 Dec 2015 14:33:56 -0500 + +neutron-lbaas (2:8.0.0~b1-0ubuntu1) xenial; urgency=medium + + * New upstream milestone for OpenStack Mitaka. + * d/control: Align (build-)depends with upstream. + + -- Corey Bryant Thu, 17 Dec 2015 10:29:41 -0500 + +neutron-lbaas (2:7.0.0-0ubuntu1) wily; urgency=medium + + * New upstream release for OpenStack Liberty. + * d/control: Add neutron-lbaasv2-agent binary (LP: #1504367). + * d/neutron-lbaasv2-agent.in*: Added for neutron-lbaasv2-agent. + * d/control: Add neutron-lbaas-common binary package. + * d/neutron-lbaas*.install: Move common install files to + neutron-lbaas-common.install + + -- Corey Bryant Thu, 15 Oct 2015 16:43:36 -0400 + +neutron-lbaas (2:7.0.0~rc2-0ubuntu1) wily; urgency=medium + + * New upstream release candidate for OpenStack Liberty. + + -- Corey Bryant Thu, 08 Oct 2015 09:54:21 -0400 + +neutron-lbaas (2:7.0.0~rc1-0ubuntu1) wily; urgency=medium + + * d/watch: Update to cope with upstream rc versioning. + * New upstream release candidate for OpenStack Liberty. + * d/rules: Drop removal of .eggs directory in override_dh_auto_clean. + * d/control: Bump minimum pbr version to 1.8. + * d/control: Align dependencies with upstream. + + -- Corey Bryant Mon, 28 Sep 2015 14:19:39 -0400 + +neutron-lbaas (2:7.0.0~b3-0ubuntu2) wily; urgency=medium + + * Move neutron_lbaas.conf and services_lbaas.conf to python-neutron-lbaas + for use across agent and central neutron-server processes. + + -- James Page Mon, 14 Sep 2015 16:28:34 +0100 + +neutron-lbaas (2:7.0.0~b3-0ubuntu1) wily; urgency=medium + + * New upstream milestone for OpenStack Liberty. + * d/control: Align (build-)depends with upstream. + + -- Corey Bryant Tue, 08 Sep 2015 16:00:46 -0400 + +neutron-lbaas (2:7.0.0~b2-0ubuntu1) wily; urgency=medium + + * New upstream milestone for OpenStack Liberty. + * d/control: Align (build-)depends with upstream. + * d/rules: Remove .eggs directory in override_dh_auto_clean. + + -- Corey Bryant Wed, 19 Aug 2015 14:26:04 -0400 + +neutron-lbaas (2:7.0.0~b1-0ubuntu4) wily; urgency=medium * d/neutron-lbaas-agent.install: Install missing configuration files - LP: #1460228 - LP: #1484153 + (LP: #1460228). + + -- James Page Fri, 24 Jul 2015 12:18:34 +0100 + +neutron-lbaas (2:7.0.0~b1-0ubuntu3) wily; urgency=medium + + * No change rebuild with SQLAlchemy 1.0.6. + + -- James Page Fri, 24 Jul 2015 11:25:45 +0100 + +neutron-lbaas (2:7.0.0~b1-0ubuntu2) wily; urgency=medium + + * Switch neutron-common -> python-neutron as BD for testing. + * Ignore broken dependency generation for oslo.messaging_. + + -- James Page Wed, 08 Jul 2015 13:33:29 +0100 + +neutron-lbaas (2:7.0.0~b1-0ubuntu1) wily; urgency=medium + + * New upstream milestone for OpenStack Liberty. + * Align (build)-depends with upstream. + + -- James Page Mon, 29 Jun 2015 10:07:38 +0100 + +neutron-lbaas (1:2015.1.0-0ubuntu1) vivid; urgency=medium + + * New upstream release for OpenStack Kilo. (LP: #1449744) + + -- Chuck Short Thu, 30 Apr 2015 17:35:09 +0200 + +neutron-lbaas (1:2015.1~rc1-0ubuntu1) vivid; urgency=medium + + * New upstream milestone release: + - d/control: Align version requirements with upstream. + - debian/patches/skip-failing-tests.patch: Skipped failing tests. + + -- Chuck Short Fri, 10 Apr 2015 09:59:17 -0400 + +neutron-lbaas (1:2015.1~b3-0ubuntu1) vivid; urgency=medium + + * New upstream milestone release: + - d/control: Align version requirements with upstream, add new + dependencies on oslo-log and python-barbicanclient. + * Enable unit test suite execution: + - d/control: Switch BD on python-neutron -> neutron-common. + - d/rules: Enable execution of unit tests, skipping tests that require + access to /etc/neutron/neutron.conf. - -- Sergey Yudin Thu, 13 Aug 2015 13:28:31 +0300 + -- James Page Mon, 30 Mar 2015 11:19:14 +0100 -neutron-lbaas (1:2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium +neutron-lbaas (1:2015.1~b2-0ubuntu1) vivid; urgency=medium - * debian/control: - - Add neutron-lbaas-doc package section - - Add python-sphinx, python-oslosphinx to build dependencies - * debian/rules: - - Add sphinxdoc to build with - - Add override_dh_sphinxdoc section + * New upstream release. + - d/control: Update/align with upstream dependency changes. - -- Sergey Kolekonov Mon, 13 Jul 2015 15:16:54 +0300 + -- James Page Mon, 16 Feb 2015 09:24:28 +0000 -neutron-lbaas (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium +neutron-lbaas (1:2015.1~b1-0ubuntu5) vivid; urgency=medium - * Fix python-oslo-* naming scheme - #LP 1459494 - * Disable unit tests execution during building + * d/copyright: Update reference for Format field. + * d/control: Add ${python:Depends} to python-neutron-lbaas package. - -- Sergey Kolekonov Thu, 28 May 2015 15:05:54 +0300 + -- James Page Tue, 20 Jan 2015 10:02:48 +0000 -neutron-lbaas (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium +neutron-lbaas (1:2015.1~b1-0ubuntu4) vivid; urgency=medium - * Updated specs for stable/kilo - * Updated dependencies according to global-requirements [0] - [0] https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt + * Initial release for OpenStack Kilo-1 milestone. - -- Sergey Kolekonov Tue, 28 Apr 2015 21:35:25 +0300 + -- James Page Wed, 14 Jan 2015 11:31:23 +0000 diff --git a/xenial/debian/control b/xenial/debian/control index 366adb2..f0bbb5e 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -1,169 +1,127 @@ Source: neutron-lbaas -Section: net +Section: python Priority: optional -Maintainer: MOS Neutron Team +Maintainer: MOS Linux Team +XSBC-Original-Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 9), dh-python, dh-systemd, - git, openstack-pkg-tools (>= 23~), - po-debconf, python-all, python-pbr (>= 1.8), python-setuptools, - python-sphinx, -Build-Depends-Indep: alembic (>= 0.8.4), + python-sphinx (>= 1.2.1), +Build-Depends-Indep: python-alembic (>= 0.8.10), python-barbicanclient (>= 4.0.0), - python-coverage, + python-coverage (>= 4.0), python-cryptography (>= 1.0), - python-eventlet (>= 0.18.4), + python-eventlet (>= 0.18.2), python-fixtures (>= 3.0.0), python-hacking (>= 0.10.0), - python-keystoneauth1 (>= 2.10.0), + python-keystoneauth1 (>= 2.18.0), python-mock (>= 2.0), - python-mysqldb, - python-netaddr (>= 0.7.12), - python-neutron (>= 2:9.0.0~b1), - python-neutron-lib (>= 0.2.0), + python-netaddr (>= 0.7.13), + python-neutron (>= 2:10.0.0~b1), + python-neutron-lib (>= 1.1.0), python-openssl (>= 0.14), python-oslo.concurrency (>= 3.8.0), python-oslo.config (>= 1:3.14.0), - python-oslo.db (>= 4.10.0), - python-oslo.log (>= 1.14.0), - python-oslo.messaging (>= 5.2.0), + python-oslo.db (>= 4.15.0), + python-oslo.log (>= 3.11.0), + python-oslo.messaging (>= 5.14.0), python-oslo.reports (>= 0.6.0), python-oslo.serialization (>= 1.10.0), python-oslo.service (>= 1.10.0), - python-oslo.utils (>= 3.16.0), - python-oslosphinx (>= 2.5.0), + python-oslo.utils (>= 3.18.0), + python-oslosphinx (>= 4.7.0), python-oslotest (>= 1.10.0), - python-psycopg2, python-pyasn1, python-pyasn1-modules, python-pymysql, python-requests (>= 2.10.0), - python-requests-mock (>= 0.7.0), + python-requests-mock (>= 1.1), python-six (>= 1.9.0), python-sqlalchemy (>= 1.0.10), - python-stevedore (>= 1.16.0), - python-testresources, - python-testscenarios, + python-stevedore (>= 1.17.1), + python-tempest (>= 1:12.1.0), + python-testrepository (>= 0.0.18), + python-testresources (>= 0.2.4), + python-testscenarios (>= 0.4), python-testtools (>= 1.4.0), - python-webob, - python-webtest, - subunit, - tempest, - testrepository, -Standards-Version: 3.9.8 -Homepage: https://github.com/openstack/neutron-lbaas -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/neutron-lbaas.git/ -Vcs-Git: https://anonscm.debian.org/git/openstack/neutron-lbaas.git + python-webob (>= 1.6.0), + python-webtest (>= 2.0), +Standards-Version: 3.9.6 +Homepage: http://github.com/openstack/neutron-lbaas Package: python-neutron-lbaas Architecture: all -Section: python -Breaks: neutron-lbaas-agent (<< 1:9.0.0~b1), -Replaces: neutron-lbaas-agent (<< 1:9.0.0~b1), -Depends: alembic (>= 0.8.4), +Depends: python-alembic (>= 0.8.10), python-barbicanclient (>= 4.0.0), python-cryptography (>= 1.0), - python-eventlet (>= 0.18.4), - python-keystoneauth1 (>= 2.10.0), - python-netaddr (>= 0.7.12), - python-neutron (>= 2:9.0.0~b2), - python-neutron-lib (>= 0.3.0), + python-eventlet (>= 0.18.2), + python-keystoneauth1 (>= 2.18.0), + python-netaddr (>= 0.7.13), + python-neutron-lib (>= 1.0.0), + python-neutron (>= 2:10.0.0~b1), python-openssl (>= 0.14), python-oslo.config (>= 1:3.14.0), - python-oslo.db (>= 4.10.0), - python-oslo.log (>= 1.14.0), - python-oslo.messaging (>= 5.2.0), + python-oslo.db (>= 4.15.0), + python-oslo.log (>= 3.16.0), + python-oslo.messaging (>= 5.14.0), python-oslo.reports (>= 0.6.0), python-oslo.serialization (>= 1.10.0), python-oslo.service (>= 1.10.0), - python-oslo.utils (>= 3.16.0), - python-pbr (>= 1.8), + python-oslo.utils (>= 3.18.0), python-pyasn1, - python-pyasn1-modules, - python-pymysql, python-requests (>= 2.10.0), python-six (>= 1.9.0), python-sqlalchemy (>= 1.0.10), - python-stevedore (>= 1.16.0), + python-stevedore (>= 1.17.1), ${misc:Depends}, - ${python:Depends}, -Recommends: iputils-arping -Provides: ${python:Provides} -Description: Loadbalancer-as-a-Service driver for OpenStack Neutron - Python 2.7 library - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. + ${python:Depends} +Breaks: neutron-lbaas-agent (<< 2:7.0.0~b3-1~), +Replaces: neutron-lbaas-agent (<< 2:7.0.0~b3-1~), +Description: Loadbalancer-as-a-Service driver for OpenStack Neutron + 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 Python 2.7 library for the Neutron load balancer. + This package provices the Loadbalancer-as-a-Service driver for Neutron. Package: neutron-lbaas-common Architecture: all -Breaks: neutron-lbaas-agent (<< 1:9.0.0~b1), -Replaces: neutron-lbaas-agent (<< 1:9.0.0~b1), Depends: haproxy, neutron-common, python-neutron-lbaas (= ${source:Version}), ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, -Description: Loadbalancer-as-a-Service driver for OpenStack networking - common files - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package contains common files for the Neutron load balancer. - -Package: neutron-lbaas-agent -Architecture: all -Depends: adduser, - debconf, - lsb-base, - neutron-common, - neutron-lbaas-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, ${shlibs:Depends} -Breaks: neutron-common (<< 2015.1~) -Replaces: neutron-common (<< 2015.1~) -Description: Loadbalancer-as-a-Service driver for OpenStack networking - Agent - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. +Breaks: neutron-lbaas-agent (<< 2:7.0.0~rc2-1~), +Replaces: neutron-lbaas-agent (<< 2:7.0.0~rc2-1~), +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 + 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 LBaaS agent. + This package provides the Load Balancing as-a Service common files. Package: neutron-lbaasv2-agent Architecture: all -Depends: adduser, - debconf, - lsb-base, - neutron-common, - neutron-lbaas-common (= ${source:Version}), +Depends: neutron-lbaas-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: neutron-common (<< 2015.1~) -Replaces: neutron-common (<< 2015.1~) -Description: Loadbalancer-as-a-Service driver for OpenStack networking - Agent v2 - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the LBaaS v2 agent. - -Package: neutron-lbaas-doc -Architecture: all -Section: doc -Depends: ${misc:Depends}, ${sphinxdoc:Depends} -Description: Loadbalancer-as-a-Service driver for OpenStack Neutron +Description: Neutron is a virtual network service for Openstack - LBaaSv2 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 @@ -173,4 +131,4 @@ Description: Loadbalancer-as-a-Service driver for OpenStack Neutron advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package contains the documentation + This package provides the Load Balancing as-a Service v2 (LBaaSv2) agent. diff --git a/xenial/debian/copyright b/xenial/debian/copyright index d5d9012..425941a 100644 --- a/xenial/debian/copyright +++ b/xenial/debian/copyright @@ -1,34 +1,34 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Neutron LBaaS -Source: https://github.com/openstack/neutron-lbaas +Upstream-Name: neutron-lbaas +Source: http://github.com/openstack/neutron-lbaas +Comment: Refactor of LBaaS codebase from Neutron core. Files: * -Copyright: (c) 2010-2016, OpenStack Foundation, - (c) 2010, United States Government - (c) 2013, IBM Corp, - (c) 2013-2014, Embrane, Inc - (c) 2013-2014, Hewlett-Packard Development Company, L.P - (c) 2013, Mirantis, Inc - (c) 2013, New Dream Network, LLC (DreamHost) - (c) 2013, Radware LTD, - (c) 2014, A10 Networks, - (c) 2014, Citrix Systems, Inc, - (c) 2014, Doug Wiegley (dougwig) - (c) 2014, VA Linux Systems Japan K.K - (c) 2014, YAMAMOTO Takashi -License: Apache-2.0 +Copyright: 2010-2014 OpenStack Foundation, + 2010 United States Government, + 2013 IBM Corp, + 2013-2014 Embrane, Inc, + 2013-2014 Hewlett-Packard Development Company, L.P, + 2013 Mirantis, Inc, + 2013 New Dream Network, LLC (DreamHost), + 2013 Radware LTD, + 2014 A10 Networks, + 2014 Citrix Systems, Inc, + 2014 Doug Wiegley (dougwig), + 2014 VA Linux Systems Japan K.K, + 2014 YAMAMOTO Takashi +License: Apache-2 Files: debian/* -Copyright: (c) 2012-2016, Thomas Goirand - (c) 2015, Canonical Ltd -License: Apache-2.0 +Copyright: 2017, MOS Linux Team +License: Apache-2 -License: Apache-2.0 +License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -37,4 +37,4 @@ License: Apache-2.0 limitations under the License. . On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. + can be found in `/usr/share/common-licenses/Apache-2.0' diff --git a/xenial/debian/gbp.conf b/xenial/debian/gbp.conf deleted file mode 100644 index 8cb45b9..0000000 --- a/xenial/debian/gbp.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -upstream-branch = master -debian-branch = debian/newton -upstream-tag = %(version)s -compression = xz - -[buildpackage] -export-dir = ../build-area/ diff --git a/xenial/debian/neutron-lbaas-agent.init.in b/xenial/debian/neutron-lbaas-agent.init.in deleted file mode 100644 index 571d40e..0000000 --- a/xenial/debian/neutron-lbaas-agent.init.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-lbaas-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron LBaaS agent -# Description: Provide LBaaS agent for neutron -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron LBaaS agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-lbaas-agent -# --config-file=/etc/neutron/neutron.conf will be happened -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/services_lbaas.conf --config-file=/etc/neutron/neutron_lbaas.conf" diff --git a/xenial/debian/neutron-lbaas-common.install b/xenial/debian/neutron-lbaas-common.install index b33b3bb..5da08c8 100644 --- a/xenial/debian/neutron-lbaas-common.install +++ b/xenial/debian/neutron-lbaas-common.install @@ -1 +1,2 @@ -usr/etc/neutron/rootwrap.d/lbaas-haproxy.filters /etc/neutron/rootwrap.d +etc/lbaas_agent.ini etc/neutron +etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d diff --git a/xenial/debian/neutron-lbaasv2-agent.init.in b/xenial/debian/neutron-lbaasv2-agent.init.in index 25dde44..464dd95 100644 --- a/xenial/debian/neutron-lbaasv2-agent.init.in +++ b/xenial/debian/neutron-lbaasv2-agent.init.in @@ -11,9 +11,10 @@ # Description: Provide LBaaS v2 agent for neutron ### END INIT INFO -# Authors: Corey Bryant , -# Thomas Goirand +# Author: Corey Bryant + # PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="OpenStack Neutron LBaaSv2 agent" PROJECT_NAME=neutron NAME=${PROJECT_NAME}-lbaasv2-agent diff --git a/xenial/debian/neutron-lbaasv2-agent.install b/xenial/debian/neutron-lbaasv2-agent.install new file mode 100644 index 0000000..8ff8b07 --- /dev/null +++ b/xenial/debian/neutron-lbaasv2-agent.install @@ -0,0 +1 @@ +usr/bin/neutron-lbaasv2-agent usr/bin diff --git a/xenial/debian/pydist-overrides b/xenial/debian/pydist-overrides new file mode 100644 index 0000000..69fac72 --- /dev/null +++ b/xenial/debian/pydist-overrides @@ -0,0 +1 @@ +oslo.messaging_ diff --git a/xenial/debian/python-neutron-lbaas.install b/xenial/debian/python-neutron-lbaas.install index 22ebe10..63002b7 100644 --- a/xenial/debian/python-neutron-lbaas.install +++ b/xenial/debian/python-neutron-lbaas.install @@ -1,2 +1,3 @@ /usr/lib/python* -usr/bin/* +etc/neutron_lbaas.conf etc/neutron +etc/services_lbaas.conf etc/neutron diff --git a/xenial/debian/rules b/xenial/debian/rules index b8fd2c7..5593492 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -1,48 +1,41 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 include /usr/share/openstack-pkg-tools/pkgos.make -PYTHONS:=$(shell pyversions -vr) +DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/./g') +export PBR_VERSION=$(VERSION) + %: - dh $@ --with python2,systemd,sphinxdoc --buildsystem=python_distutils + dh $@ --with python2,systemd --buildsystem=python_distutils override_dh_install: - tools/generate_config_file_samples.sh - bash -c 'for conf in $$(ls etc/*lbaas*.sample); do mv $$conf $${conf%.*}; done' + PYTHONPATH=$(CURDIR) $(CURDIR)/tools/generate_config_file_samples.sh + find $(CURDIR)/etc -type f | xargs rename 's/\.sample$$//' dh_install -override_dh_auto_test: +# NOTE(jamespage): Some tests need access to /etc/neutron/neutron.conf, +# skip these as this file will contain access credentials +# so is not world readable. +# neutron_lbaas.tests.unit.agent.test_agent.TestLbaasService.test_main +# neutron_lbaas.tests.unit.common.tls_utils.test_cert_parser.TestTLSParseUtils.test_read_private_key +# neutron_lbaas.tests.unit.services.loadbalancer.agent.test_agent.TestLbaasService.test_main +SKIPTEST := (?!.*TestTLSParseUtils.test_read_private_key.*)(?!.*TestLbaasService.test_main.*) ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - @echo "===> Running tests" - set -e ; set -x ; for i in 2.7 ; do \ - PYMAJOR=`echo $$i | cut -d'.' -f1` ; \ - echo "===> Testing with python$$i (python$$PYMAJOR)" ; \ - rm -rf .testrepository ; \ - testr-python$$PYMAJOR init ; \ - TEMP_REZ=`mktemp -t` ; \ - PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'neutron_lbaas\.tests\.unit\.(?!(.*test_synchronous_driver.TestHaproxyNSDriver.test_cleanup_name.*|.*test_v2_plugin_driver.TestLBaaSDriver.test_wf_created_on_first_member_creation.*|.*test_v2_plugin_driver.TestLBaaSDriverRestClient.test_flip_servers.*))' | tee $$TEMP_REZ | subunit2pyunit ; \ - cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \ - rm -f $$TEMP_REZ ; \ - testr-python$$PYMAJOR slowest ; \ - done +override_dh_auto_test: + rm -rf .testrepository + testr init && \ + set -e && \ + TEMP_REZ=`mktemp -t` && \ + PYTHONPATH=$(CURDIR) testr run --subunit 'neutron_lbaas\.tests\.unit\.$(SKIPTEST)' | tee $$TEMP_REZ | subunit2pyunit; \ + rm -f $$TEMP_REZ ; endif override_dh_auto_clean: dh_auto_clean - rm -f debian/*.init debian/*.service debian/*.upstart - -override_dh_clean: - dh_clean - find . -type f -name "*.pyc" -delete - rm -rf build - -override_dh_sphinxdoc: -ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) - python setup.py build_sphinx - cp -rf doc/build/html $(CURDIR)/debian/neutron-lbaas-doc/usr/share/doc/neutron-lbaas-doc - dh_sphinxdoc -O--buildsystem=python_distutils -endif + rm -rf .testrepository + rm -f debian/*.upstart debian/*.init debian/*.service -- 2.45.2