[MOS 10.0] Update neutron-lbaas package

Version: 2:9.0.0-1~u16.04+mos0
Fix (build-)dependencies.

Change-Id: I19c82c323a5df3c5c04d705fcb459051ae3e89de

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 3da686b256aee8307e6190b9f59a412b1144ab51..f2202be58bd776d741540f0dab15918de1df1059 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+neutron-lbaas (2:9.0.0-1~u16.04+mos0) mos10.0; urgency=medium
+
+  * Fix (build-)dependencies.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Sun, 30 Oct 2016 16:09:58 +0200
+
 neutron-lbaas (2:9.0.0~b2-2~u16.04+mos1) mos10; urgency=medium
 
   * Update requirements

diff --git a/xenial/debian/control b/xenial/debian/control
index 366adb2a8496c5e3293b3fa96eae168b5e36f720..ef154b95b22de9d8039270082c84088da1e42921 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -11,10 +11,10 @@ Build-Depends: debhelper (>= 9),
                python-all,
                python-pbr (>= 1.8),
                python-setuptools,
-               python-sphinx,
+               python-sphinx (>= 1.2.1),
 Build-Depends-Indep: alembic (>= 0.8.4),
                      python-barbicanclient (>= 4.0.0),
-                     python-coverage,
+                     python-coverage (>= 3.6),
                      python-cryptography (>= 1.0),
                      python-eventlet (>= 0.18.4),
                      python-fixtures (>= 3.0.0),
@@ -22,7 +22,7 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-keystoneauth1 (>= 2.10.0),
                      python-mock (>= 2.0),
                      python-mysqldb,
-                     python-netaddr (>= 0.7.12),
+                     python-netaddr (>= 0.7.13),
                      python-neutron (>= 2:9.0.0~b1),
                      python-neutron-lib (>= 0.2.0),
                      python-openssl (>= 0.14),
@@ -42,15 +42,15 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-pyasn1-modules,
                      python-pymysql,
                      python-requests (>= 2.10.0),
-                     python-requests-mock (>= 0.7.0),
+                     python-requests-mock (>= 1.0),
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.16.0),
-                     python-testresources,
-                     python-testscenarios,
+                     python-testresources (>= 0.2.4),
+                     python-testscenarios (>= 0.4),
                      python-testtools (>= 1.4.0),
-                     python-webob,
-                     python-webtest,
+                     python-webob (>= 1.2.3),
+                     python-webtest (>= 2.0),
                      subunit,
                      tempest,
                      testrepository,
@@ -69,7 +69,7 @@ Depends: alembic (>= 0.8.4),
          python-cryptography (>= 1.0),
          python-eventlet (>= 0.18.4),
          python-keystoneauth1 (>= 2.10.0),
-         python-netaddr (>= 0.7.12),
+         python-netaddr (>= 0.7.13),
          python-neutron (>= 2:9.0.0~b2),
          python-neutron-lib (>= 0.3.0),
          python-openssl (>= 0.14),
@@ -162,7 +162,7 @@ Description: Loadbalancer-as-a-Service driver for OpenStack networking - Agent v
 Package: neutron-lbaas-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+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

diff --git a/xenial/debian/rules b/xenial/debian/rules
index b8fd2c7ea55ab3e0df7987333ab4ab4f9f0d1a7d..229804de6b974814db2f188dcfcaf907a76fb509 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,19 +1,42 @@
 #!/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
+       dh $@ --buildsystem=python_distutils --with python2,systemd
+
+override_dh_auto_install:
+       echo "Do nothing..."
 
 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
+       rm -rf $(CURDIR)/debian/tmp
+       python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
+
+       # lbaas_agent.ini
+       mkdir -p $(CURDIR)/debian/neutron-lbaas-common/etc/neutron
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+               --output-file $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/lbaas_agent.ini \
+               --wrap-width 140 \
+               --namespace neutron.lbaas.agent \
+               --namespace oslo.log
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/lbaas_agent.ini DEFAULT interface_driver openvswitch
+
+       # neutron_lbaas.conf
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+               --output-file $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/neutron_lbaas.conf \
+               --wrap-width 140 \
+               --namespace neutron.lbaas
+
+       # services_lbaas.conf
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+               --output-file $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/services_lbaas.conf \
+               --wrap-width 140 \
+               --namespace neutron.lbaas.service
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/services_lbaas.conf service_providers service_provider LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+
+       dh_install -O--buildsystem=python_distutils --fail-missing
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
@@ -24,7 +47,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
                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 ; \
+               PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit --parallel '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 ; \
@@ -40,9 +63,10 @@ override_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
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:

diff --git a/xenial/debian/source/options b/xenial/debian/source/options
new file mode 100644 (file)
index 0000000..9122245
--- /dev/null
+++ b/xenial/debian/source/options
@@ -0,0 +1,2 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^[.]gitreview$"

diff --git a/xenial/debian/watch b/xenial/debian/watch
index a72b688956aef6cc14f4e02cd4c3b248d03d35a0..0b84d95167c613b0652b44a334517068a35d9225 100644 (file)
--- a/xenial/debian/watch
+++ b/xenial/debian/watch
@@ -1,3 +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
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+https://github.com/openstack/neutron-lbaas/tags .*/(\d[\d\.]+)\.tar\.gz