From: Sergey Kolekonov Date: Tue, 20 Oct 2015 16:25:57 +0000 (+0300) Subject: Add neutron-lbaas for MOS 8.0 X-Git-Tag: mos-9.0~9 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F13001%2F1;p=openstack-build%2Fneutron-lbaas-build.git Add neutron-lbaas for MOS 8.0 Change-Id: I78a0fe36ca85160efecf34af37d8c42b387b5560 Source: http://archive.ubuntu.com/ubuntu/pool/main/n/neutron-lbaas/neutron-lbaas_7.0.0-0ubuntu1.dsc --- diff --git a/trusty/debian/changelog b/trusty/debian/changelog index d98639c..f332d51 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +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 diff --git a/trusty/debian/control b/trusty/debian/control index 0150b0d..3087b22 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -2,57 +2,74 @@ Source: neutron-lbaas Section: python Priority: optional Maintainer: MOS Neutron Team -Build-Depends: - debhelper (>= 9), - dh-python, - dh-systemd, - openstack-pkg-tools (>= 21), - python-all (>= 2.7.1) -Build-Depends-Indep: - alembic (>= 0.7.2), - neutron-common (>= 1:2015.1), - python-barbicanclient (>= 3.0.1), - python-cliff (>= 1.10.0), - python-coverage, - python-eventlet (>= 0.16.1), - python-fixtures (>= 0.3.14), - python-greenlet (>= 0.3.2), - python-hacking (>= 0.10.0), - python-mock (>= 1.0), - python-netaddr (>= 0.7.12), - python-novaclient (>= 1:2.22.0), - python-openssl (>= 0.11), - python-oslo.config (>= 1:1.9.3), - python-oslo.db (>= 1.7.0), - python-oslo.log (>= 1.0.0), - python-oslo.messaging (>= 1.8.0), - python-oslo.rootwrap (>= 1.6.0), - python-oslo.serialization (>= 1.4.0), - python-oslosphinx (>= 2.5.0), - python-oslo.utils (>= 1.4.0), - python-oslotest (>= 1.5.1), - python-pbr (>= 0.10), - python-pyasn1, - python-pyasn1-modules, - python-requests (>= 2.2.0), - python-requests-mock (>= 0.6.0), - python-setuptools, - python-six (>= 1.9.0), - python-sphinx (>= 1.1.2), - python-sqlalchemy (>= 0.9.7), - python-stevedore (>= 1.3.0), - python-subunit (>= 0.0.18), - python-testscenarios (>= 0.4), - python-testtools (>= 0.9.36), - python-webob (>= 1.2.3), - python-webtest (>= 2.0), - testrepository ( >= 0.0.18) +Build-Depends: debhelper (>= 9), + dh-python, + dh-systemd, + openstack-pkg-tools (>= 23~), + python-all, + python-pbr (>= 1.8), + python-setuptools, + python-sphinx, +Build-Depends-Indep: alembic (>= 0.8.0), + python-barbicanclient (>= 3.3.0), + python-coverage (>= 3.6), + python-eventlet (>= 0.17.4), + python-fixtures (>= 1.3.1), + python-hacking, + python-mock (>= 1.2), + python-netaddr (>= 0.7.12), + python-neutron (>= 2:7.0.0~b1), + python-openssl (>= 0.14), + python-oslo.concurrency (>= 2.3.0), + python-oslo.config (>= 1:2.3.0), + python-oslo.db (>= 2.4.1), + python-oslo.log (>= 1.8.0), + python-oslo.messaging (>= 1.16.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.service (>= 0.7.0), + python-oslo.utils (>= 2.0.0), + python-oslosphinx (>= 2.5.0), + python-pyasn1, + python-pyasn1-modules, + python-requests (>= 2.5.2), + python-requests-mock (>= 0.6.0), + python-six (>= 1.9.0), + python-sqlalchemy (>= 0.9.7), + python-stevedore (>= 1.5.0), + python-tempest-lib (>= 0.8.0), + python-testscenarios (>= 0.4), + python-testtools (>= 1.4.0), + python-webob (>= 1.2.3), + python-webtest (>= 2.0), + subunit (>= 0.0.18), + testrepository (>= 0.0.18), Standards-Version: 3.9.6 Homepage: http://github.com/openstack/neutron-lbaas Package: python-neutron-lbaas Architecture: all -Depends: ${misc:Depends}, ${python:Depends} +Depends: alembic (>= 0.8.0), + python-barbicanclient (>= 3.3.0), + python-eventlet (>= 0.17.4), + python-netaddr (>= 0.7.12), + python-openssl (>= 0.14), + python-oslo.config (>= 1:2.3.0), + python-oslo.db (>= 2.4.1), + python-oslo.log (>= 1.8.0), + python-oslo.messaging (>= 1.16.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.service (>= 0.7.0), + python-oslo.utils (>= 2.0.0), + python-pyasn1, + python-pyasn1-modules, + python-requests (>= 2.5.2), + python-six (>= 1.9.0), + python-sqlalchemy (>= 0.9.7), + python-stevedore (>= 1.5.0), + ${misc:Depends}, + ${python:Depends}, +Breaks: neutron-lbaas-agent (<< 2:7.0.0~b3-0ubuntu2~), +Replaces: neutron-lbaas-agent (<< 2:7.0.0~b3-0ubuntu2~), 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 @@ -65,15 +82,34 @@ Description: Loadbalancer-as-a-Service driver for OpenStack Neutron . This package provices the Loadbalancer-as-a-Service driver for Neutron. +Package: neutron-lbaas-common +Architecture: all +Depends: haproxy, + neutron-common, + python-neutron-lbaas (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends}, +Breaks: neutron-lbaas-agent (<< 2:7.0.0~rc2-0ubuntu2~), +Replaces: neutron-lbaas-agent (<< 2:7.0.0~rc2-0ubuntu2~), +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 Load Balancing as-a Service common files. + Package: neutron-lbaas-agent Architecture: all -Depends: - haproxy, - neutron-common, - python-neutron-lbaas (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} +Depends: neutron-lbaas-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends}, Description: Neutron is a virtual network service for Openstack - LBaaS agent Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -86,6 +122,24 @@ Description: Neutron is a virtual network service for Openstack - LBaaS agent . This package provides the Load Balancing as-a Service (LBaaS) agent. +Package: neutron-lbaasv2-agent +Architecture: all +Depends: neutron-lbaas-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends}, +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 + 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 Load Balancing as-a Service v2 (LBaaSv2) agent. + Package: neutron-lbaas-doc Architecture: all Section: doc diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf new file mode 100644 index 0000000..43fb044 --- /dev/null +++ b/trusty/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = master +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff --git a/trusty/debian/neutron-lbaas-agent.init.in b/trusty/debian/neutron-lbaas-agent.init.in index a5bcfaf..cad5a1d 100644 --- a/trusty/debian/neutron-lbaas-agent.init.in +++ b/trusty/debian/neutron-lbaas-agent.init.in @@ -20,4 +20,4 @@ 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 --log-file=/var/log/neutron/lbaas-agent.log" +DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini" diff --git a/trusty/debian/neutron-lbaas-agent.install b/trusty/debian/neutron-lbaas-agent.install index 17742c8..54f499d 100644 --- a/trusty/debian/neutron-lbaas-agent.install +++ b/trusty/debian/neutron-lbaas-agent.install @@ -1,6 +1 @@ -debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d -etc/lbaas_agent.ini etc/neutron -etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d usr/bin/neutron-lbaas-agent usr/bin -etc/neutron_lbaas.conf etc/neutron -etc/services_lbaas.conf etc/neutron diff --git a/trusty/debian/neutron-lbaas-common.install b/trusty/debian/neutron-lbaas-common.install new file mode 100644 index 0000000..f3ebaa2 --- /dev/null +++ b/trusty/debian/neutron-lbaas-common.install @@ -0,0 +1,5 @@ +debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d +etc/lbaas_agent.ini etc/neutron +etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d +etc/neutron_lbaas.conf etc/neutron +etc/services_lbaas.conf etc/neutron diff --git a/trusty/debian/neutron-lbaasv2-agent.init.in b/trusty/debian/neutron-lbaasv2-agent.init.in new file mode 100644 index 0000000..464dd95 --- /dev/null +++ b/trusty/debian/neutron-lbaasv2-agent.init.in @@ -0,0 +1,23 @@ +#!/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 + +# 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 +# --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/trusty/debian/neutron-lbaasv2-agent.install b/trusty/debian/neutron-lbaasv2-agent.install new file mode 100644 index 0000000..8ff8b07 --- /dev/null +++ b/trusty/debian/neutron-lbaasv2-agent.install @@ -0,0 +1 @@ +usr/bin/neutron-lbaasv2-agent usr/bin diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides new file mode 100644 index 0000000..69fac72 --- /dev/null +++ b/trusty/debian/pydist-overrides @@ -0,0 +1 @@ +oslo.messaging_ diff --git a/trusty/debian/rules b/trusty/debian/rules index f254eae..03a8ac1 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -15,8 +15,8 @@ include /usr/share/openstack-pkg-tools/pkgos.make # 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))) override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) rm -rf .testrepository testr init && \ set -e && \ diff --git a/trusty/debian/watch b/trusty/debian/watch new file mode 100644 index 0000000..a72b688 --- /dev/null +++ b/trusty/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