From: Jerzy Mikolajczak Date: Thu, 30 Jun 2016 11:10:39 +0000 (+0200) Subject: Update neutron-lbaas to 9.0.0~b1 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F22750%2F2;p=openstack-build%2Fneutron-lbaas-build.git Update neutron-lbaas to 9.0.0~b1 * Rebuild for Xenial, source: [0] * Rebuild for Centos7 * Requirements update based on project requirements [0] http://anonscm.debian.org/git/openstack/neutron-lbaas.git/?h=debian%2Fnewton Change-Id: Ic6d021e809bf49e3092ffe8bcb5b8e085f184ab7 --- diff --git a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec index 1017463..562756f 100644 --- a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec +++ b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec @@ -1,10 +1,10 @@ %global modulename neutron_lbaas %global servicename neutron-lbaas %global type LBaaS -%global min_neutron_version 1:8.0.0 +%global min_neutron_version 1:9.0.0~b1 Name: openstack-%{servicename} -Version: 8.0.0 +Version: 9.0.0~b1 Release: 1%{?dist}~mos1 Epoch: 1 Summary: Openstack Networking %{type} plugin @@ -17,9 +17,9 @@ Source2: %{servicename}v2-agent.service BuildArch: noarch BuildRequires: python2-devel -BuildRequires: python-barbicanclient >= 3.3.0 +BuildRequires: python-barbicanclient >= 4.0.0 BuildRequires: python-neutron >= %{min_neutron_version} -BuildRequires: python-neutron-lib +BuildRequires: python-neutron-lib >= 0.2.0 BuildRequires: python-pbr BuildRequires: python-pyasn1 BuildRequires: python-pyasn1-modules @@ -41,7 +41,7 @@ Summary: Neutron %{type} Python libraries Group: Applications/System Requires: python-neutron >= %{min_neutron_version} -Requires: python-barbicanclient >= 3.3.0 +Requires: python-barbicanclient >= 4.0.0 Requires: python-pyasn1 Requires: python-pyasn1-modules Requires: pyOpenSSL @@ -158,6 +158,10 @@ ln -s %{_sysconfdir}/neutron/%{modulename}.conf %{buildroot}%{_datadir}/neutron/ %changelog +* Mon Apr 11 2016 Jerzy Mikolajczak 1:9.0.0~b1-1.el7 +- Update to upstream 9.0.0~b1 +- Update requirements + * Mon Apr 11 2016 Jerzy Mikolajczak 1:8.0.0-1.el7 - Update to upstream 8.0.0 - Update requirements @@ -183,4 +187,4 @@ ln -s %{_sysconfdir}/neutron/%{modulename}.conf %{buildroot}%{_datadir}/neutron/ - Update to upstream 7.0.0.0rc1 * Wed Sep 16 2015 Ihar Hrachyshka 1:7.0.0-0.1.0b3.el7 -- Initial release for Liberty M3. \ No newline at end of file +- Initial release for Liberty M3. diff --git a/xenial/debian/changelog b/xenial/debian/changelog new file mode 100644 index 0000000..de24fb7 --- /dev/null +++ b/xenial/debian/changelog @@ -0,0 +1,73 @@ +neutron-lbaas (2:9.0.0~b1-1~u16.04+mos1) mos10.0; urgency=medium + + * Update requirements based on project requirements + * Source: http://anonscm.debian.org/git/openstack/neutron-lbaas.git/?h=debian%2Fnewton + + -- Jerzy Mikolajczak Thu, 30 Jun 2016 13:07:02 +0200 + +neutron-lbaas (2:8.0.0-1~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 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 + + -- Jerzy Mikolajczak Tue, 15 Mar 2016 08:51:24 +0100 + +neutron-lbaas (2:8.0.0~b2-1~u14.04+mos1) mos9.0; urgency=medium + + * Source [0] + [0] http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_8.0.0~b1-0ubuntu2.dsc + + -- Jerzy Mikolajczak Wed, 20 Jan 2016 12:47:15 +0100 + +neutron-lbaas (2:7.0.0.0b2-1~u14.04+mos1) mos8.0; urgency=medium + + * Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_7.0.0-0ubuntu1.dsc + + -- Sergey Kolekonov Tue, 20 Oct 2015 19:21:05 +0300 + +neutron-lbaas (1:2015.1.1-1~u14.04+mos1) mos7.0; urgency=medium + + * Bump version to 2015.1.1 according to the latest tag + + -- Sergey Kolekonov Fri, 14 Aug 2015 14:36:10 +0300 + +neutron-lbaas (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium + + * d/neutron-lbaas-agent.install: Install missing configuration files + LP: #1460228 + LP: #1484153 + + -- Sergey Yudin Thu, 13 Aug 2015 13:28:31 +0300 + +neutron-lbaas (1:2015.1.0-1~u14.04+mos3) mos7.0; 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 + + -- Sergey Kolekonov Mon, 13 Jul 2015 15:16:54 +0300 + +neutron-lbaas (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium + + * Fix python-oslo-* naming scheme + #LP 1459494 + * Disable unit tests execution during building + + -- Sergey Kolekonov Thu, 28 May 2015 15:05:54 +0300 + +neutron-lbaas (1:2015.1.0-1~u14.04+mos1) mos7.0; 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 + + -- Sergey Kolekonov Tue, 28 Apr 2015 21:35:25 +0300 diff --git a/xenial/debian/compat b/xenial/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/xenial/debian/compat @@ -0,0 +1 @@ +9 diff --git a/xenial/debian/control b/xenial/debian/control new file mode 100644 index 0000000..761e89f --- /dev/null +++ b/xenial/debian/control @@ -0,0 +1,174 @@ +Source: neutron-lbaas +Section: net +Priority: optional +Maintainer: MOS Neutron Team +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-barbicanclient (>= 4.0.0), + python-coverage, + python-eventlet (>= 0.18.4), + python-fixtures (>= 1.3.1), + python-hacking (>= 0.10.0), + python-keystoneauth1 (>= 2.1.0), + python-mock (>= 1.3), + python-mysqldb, + python-netaddr (>= 0.7.12), + python-neutron (>= 2:9.0.0~b1), + python-neutron-lib (>= 0.2.0), + python-openssl (>= 0.14), + python-oslo.concurrency (>= 3.5.0), + python-oslo.config (>= 1:3.10.0), + python-oslo.db (>= 4.1.0), + python-oslo.log (>= 1.14.0), + python-oslo.messaging (>= 5.2.0), + python-oslo.reports (>= 0.6.0), + python-oslo.serialization (>= 1.10.0), + python-oslo.service (>= 1.10.0), + python-oslo.utils (>= 3.5.0), + python-oslosphinx (>= 2.5.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-six (>= 1.9.0), + python-sqlalchemy (>= 1.0.10), + python-stevedore (>= 1.10.0), + python-testresources, + python-testscenarios, + 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 + +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), + python-barbicanclient (>= 4.0.0), + python-eventlet (>= 0.18.4), + python-keystoneauth1 (>= 2.1.0), + python-netaddr (>= 0.7.12), + python-neutron (>= 2:9.0.0~b1), + python-neutron-lib (>= 0.2.0), + python-openssl (>= 0.14), + python-oslo.config (>= 1:3.10.0), + python-oslo.db (>= 4.1.0), + python-oslo.log (>= 1.14.0), + python-oslo.messaging (>= 5.2.0), + python-oslo.reports (>= 0.6.0), + python-oslo.serialization (>= 1.10.0), + python-oslo.service (>= 1.10.0), + python-oslo.utils (>= 3.5.0), + python-pbr (>= 1.8), + 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.10.0), + ${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. + . + This package provides the Python 2.7 library for the Neutron load balancer. + +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. + . + This package provides the LBaaS agent. + +Package: neutron-lbaasv2-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 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 + 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 contains the documentation diff --git a/xenial/debian/copyright b/xenial/debian/copyright new file mode 100644 index 0000000..d5d9012 --- /dev/null +++ b/xenial/debian/copyright @@ -0,0 +1,40 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Neutron LBaaS +Source: https://github.com/openstack/neutron-lbaas + +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 + +Files: debian/* +Copyright: (c) 2012-2016, Thomas Goirand + (c) 2015, Canonical Ltd +License: Apache-2.0 + +License: Apache-2.0 + 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 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + 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'. diff --git a/xenial/debian/gbp.conf b/xenial/debian/gbp.conf new file mode 100644 index 0000000..8cb45b9 --- /dev/null +++ b/xenial/debian/gbp.conf @@ -0,0 +1,8 @@ +[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 new file mode 100644 index 0000000..571d40e --- /dev/null +++ b/xenial/debian/neutron-lbaas-agent.init.in @@ -0,0 +1,23 @@ +#!/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 new file mode 100644 index 0000000..b33b3bb --- /dev/null +++ b/xenial/debian/neutron-lbaas-common.install @@ -0,0 +1 @@ +usr/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 new file mode 100644 index 0000000..25dde44 --- /dev/null +++ b/xenial/debian/neutron-lbaasv2-agent.init.in @@ -0,0 +1,22 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: neutron-lbaasv2-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 v2 agent +# Description: Provide LBaaS v2 agent for neutron +### END INIT INFO + +# Authors: Corey Bryant , +# Thomas Goirand +# PATH should only include /usr/* if it runs after the mountnfs.sh script +DESC="OpenStack Neutron LBaaSv2 agent" +PROJECT_NAME=neutron +NAME=${PROJECT_NAME}-lbaasv2-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" diff --git a/xenial/debian/python-neutron-lbaas.install b/xenial/debian/python-neutron-lbaas.install new file mode 100644 index 0000000..22ebe10 --- /dev/null +++ b/xenial/debian/python-neutron-lbaas.install @@ -0,0 +1,2 @@ +/usr/lib/python* +usr/bin/* diff --git a/xenial/debian/rules b/xenial/debian/rules new file mode 100755 index 0000000..b8fd2c7 --- /dev/null +++ b/xenial/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +include /usr/share/openstack-pkg-tools/pkgos.make + +PYTHONS:=$(shell pyversions -vr) + +%: + dh $@ --with python2,systemd,sphinxdoc --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' + dh_install + +override_dh_auto_test: +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 +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 diff --git a/xenial/debian/source/format b/xenial/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/xenial/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/xenial/debian/watch b/xenial/debian/watch new file mode 100644 index 0000000..a72b688 --- /dev/null +++ b/xenial/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/\.0b/~b/;s/\.0rc/~rc/" \ + http://tarballs.openstack.org/neutron-lbaas neutron-lbaas-(\d.*)\.tar\.gz