* Align the package with the one from Ubuntu, so that it is compatible with

    upstream puppet-openstack.
  * Fixed debian/copyright (missing holders).
  * Moved /usr/bin/* to python-lbaas-agent, so that we can later on provide a
    Python 3 implementation. Now using lbaas-agent-common for config files only
    and 2 packages for the daemons.

Rewritten-From: 24806cb8d7ad5842bf531cc5451f3479d72dde54

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index ebaedf3f265548346c2e1550e938c98ceb15378b..9e247d69566c325ce3deddc95cfe0c6ded1180f3 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -7,6 +7,12 @@ neutron-lbaas (1:9.0.0~b1-1) experimental; urgency=medium
   [ Thomas Goirand ]
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Align the package with the one from Ubuntu, so that it is compatible with
+    upstream puppet-openstack.
+  * Fixed debian/copyright (missing holders).
+  * Moved /usr/bin/* to python-lbaas-agent, so that we can later on provide a
+    Python 3 implementation. Now using lbaas-agent-common for config files only
+    and 2 packages for the daemons.
 
  -- Thomas Goirand <zigo@debian.org>  Sat, 18 Jun 2016 15:45:22 +0200
 

diff --git a/xenial/debian/control b/xenial/debian/control
index 10d6a7369cab7fc015bdedd6d2d71f446dcb1f13..803a39cb4b87a35e08fbc21cdcabc96f9942b36d 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -90,13 +90,29 @@ Depends: alembic (>= 0.8.4),
          ${python:Depends},
 Recommends: iputils-arping
 Provides: ${python:Provides}
-Description: OpenStack virtual network service - Python library
+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 library.
+ This package provides the Python 2.7 library for the Neutron load balancer.
+
+Package: neutron-lbaas-common
+Architecture: all
+Depends: haproxy,
+         neutron-common,
+         python-neutron-lbaas (= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends},
+Description: Loadbalancer-as-a-Service driver for OpenStack Neutron - 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
@@ -104,6 +120,7 @@ Depends: adduser,
          debconf,
          lsb-base,
          neutron-common,
+         neutron-lbaas-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -116,3 +133,23 @@ Description: OpenStack virtual network service - lbass agent
  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: OpenStack virtual network service - lbass 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 agent.

diff --git a/xenial/debian/copyright b/xenial/debian/copyright
index 1732237d4d02f52e9bd6824fadb5119bbf14f8de..d5d90124fd9c57e1ddefca41def2aa4a175a7b38 100644 (file)
--- a/xenial/debian/copyright
+++ b/xenial/debian/copyright
@@ -3,12 +3,24 @@ Upstream-Name: Neutron LBaaS
 Source: https://github.com/openstack/neutron-lbaas
 
 Files: *
-Copyright: (c) 2011-2012, OpenStack, LLC.
-           (c) 2013-2014, The OpenStack Foundation
+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 <yamamoto@valinux.co.jp>
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2012-2016, Thomas Goirand <zigo@debian.org>
+Copyright: (c) 2012-2016, Thomas Goirand <zigo@debian.org>
+           (c) 2015, Canonical Ltd
 License: Apache-2.0
 
 License: Apache-2.0

diff --git a/xenial/debian/neutron-lbaas-agent.install b/xenial/debian/neutron-lbaas-common.install
similarity index 55%
rename from xenial/debian/neutron-lbaas-agent.install
rename to xenial/debian/neutron-lbaas-common.install
index d958504492d1eafbbc5716f6f22f061b9ac70eb5..b33b3bb36bf434ffc05e6f0fbc8e970077f48161 100644 (file)
--- a/xenial/debian/neutron-lbaas-agent.install
+++ b/xenial/debian/neutron-lbaas-common.install
@@ -1,3 +1 @@
 usr/etc/neutron/rootwrap.d/lbaas-haproxy.filters       /etc/neutron/rootwrap.d
-usr/bin/neutron-lbaasv2-agent
-usr/bin/neutron-lbaas-agent

diff --git a/xenial/debian/neutron-lbaasv2-agent.init.in b/xenial/debian/neutron-lbaasv2-agent.init.in
new file mode 100644 (file)
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 <corey.bryant@canonical.com>,
+#          Thomas Goirand <zigo@debian.org>
+# 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
index 47e0ed4366b73379bd73a76ad2a7a2d89242ef49..22ebe109c8c8b1c6b25944e95e5fe33f86e80f44 100644 (file)
--- a/xenial/debian/python-neutron-lbaas.install
+++ b/xenial/debian/python-neutron-lbaas.install
@@ -1 +1,2 @@
 /usr/lib/python*
+usr/bin/*

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 12a0477d799b538ce2db4dea3c91734f543bf8a4..e9a2f3cedcad44157b7e424d20e9088cdb380c6a 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
 
 include /usr/share/openstack-pkg-tools/pkgos.make
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 
 PYTHONS:=$(shell pyversions -vr)
 
 %:
        dh $@ --buildsystem=python_distutils --with python2,systemd
 
+override_dh_auto_install:
+       echo "Do nothing..."
+
 override_dh_install:
        rm -rf $(CURDIR)/debian/tmp
        python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp