Update to 8.0.0.0b1

- Source [0]
- Add missing dependencies (radvd, python-openvswitch, python-pyroute2)
  Commits 918a100 a5a14ee
- Update references to Nicira NVP plugin (e839df9)
- Do not manage nova_admin_* options from templates (054c7f1)
- Generate configuration files
- Add missing packages neutron-plugin-sriov-agent and neutron-plugin-ml2
- Add doc package and git as a build dependency
- Update requirements according to global requirements [1]
- Update tests

[0] http://anonscm.debian.org/git/openstack/neutron.git/tree/?h=debian/mitaka
[1] https://github.com/openstack/requirements/blob/master/global-requirements.txt

Change-Id: Ic698dfe2e877c6e3ff8dc8f1811631482f449237

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 372e4add2e67067bdafe23189b2035acc5b33a15..ba8e0322ace82add9c19faabc394867b8d9c9870 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -216,7 +216,7 @@ check_neutron_openvswitch () {
     if ! $SERVICE_STARTED ; then
         if $UBUNTU; then
             restart_service openvswitch-switch
-            restart_service neutron-plugin-openvswitch-agent
+            restart_service neutron-openvswitch-agent
         else
             restart_service openvswitch
             restart_service neutron-openvswitch-agent
@@ -225,7 +225,7 @@ check_neutron_openvswitch () {
     fi
 
     sleep 10
-    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $5}' | tr -d " ")
+    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $6}' | tr -d " ")
     if [ "$STATUS" != ":-)" ]; then echo "OVS agent check failed"; FAILURE=true; fi
 }
 
@@ -236,7 +236,7 @@ check_neutron_l3_agent () {
     fi
     #This sleep here and in other functions is intended to let the agent add information to the queue
     sleep 10
-    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $5}' | tr -d " ")
+    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $6}' | tr -d " ")
     if [ "$STATUS" != ":-)" ]; then echo "L3 agent check failed"; FAILURE=true; fi
 }
 
@@ -246,7 +246,7 @@ check_neutron_dhcp_agent () {
         SERVICE_STARTED=true
     fi
     sleep 10
-    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $5}' | tr -d " ")
+    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $6}' | tr -d " ")
     if [ "$STATUS" != ":-)" ]; then echo "DHCP agent check failed"; FAILURE=true; fi
 }
 
@@ -256,7 +256,7 @@ check_neutron_metadata_agent () {
         SERVICE_STARTED=true
     fi
     sleep 10
-    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $5}' | tr -d " ")
+    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $6}' | tr -d " ")
     if [ "$STATUS" != ":-)" ]; then echo "Metadata agent check failed"; FAILURE=true; fi
 }
 
@@ -266,7 +266,7 @@ check_neutron_metering_agent () {
         SERVICE_STARTED=true
     fi
     sleep 10
-    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $5}' | tr -d " ")
+    STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $6}' | tr -d " ")
     if [ "$STATUS" != ":-)" ]; then echo "Metering agent check failed"; FAILURE=true; fi
 }
 
@@ -322,7 +322,7 @@ case $PACKAGE in
     try check_neutron_server
     check_error
   ;;
-  openstack-neutron-openvswitch|neutron-plugin-openvswitch-agent)
+  openstack-neutron-openvswitch|neutron-openvswitch-agent)
     install_packages
     install_neutron_server
     setup_database
@@ -370,7 +370,7 @@ case $PACKAGE in
     try check_neutron_metadata_agent
     check_error
   ;;
-  openstack-neutron-metering-agent|neutron-plugin-metering-agent)
+  openstack-neutron-metering-agent|neutron-metering-agent)
     install_neutron_server
     install_packages
     setup_database

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a74808231cca8a2590cc6020d87d036f388b0267..2992bcaa39dbc6e32e56e856d44cbf22cb3016b7 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,27 @@
+neutron (2:8.0.0~b1-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Source [0]
+    [0] http://anonscm.debian.org/git/openstack/neutron.git/tree/debian?h=debian/mitaka
+  * Add missing dependencies (radvd, python-openvswitch, python-pyroute2)
+    Commits 918a100 a5a14ee
+  * Update references to Nicira NVP plugin (e839df9)
+  * Do not manage nova_admin_* options from templates (054c7f1)
+  * Generate configuration files
+  * Add missing packages neutron-plugin-sriov-agent and neutron-plugin-ml2
+  * Add doc package and git as a build dependency
+  * Update requirements according to global requirements [1]
+    [1] https://github.com/openstack/requirements/blob/master/global-requirements.txt
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Mon, 18 Jan 2016 19:48:23 +0300
+
+neutron (1:8.0.0~b1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depeneds for this release.
+  * Rebased better-config-defaults.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 04 Dec 2015 09:03:42 +0100
+
 neutron (2:7.0.1-1~u14.04+mos1) mos8.0; urgency=medium
 
   * Fix version according to versioning policy
@@ -50,6 +74,20 @@ neutron (2:7.0.0.0b2-1~u14.04+mos1) mos8.0; urgency=medium
 
  -- Sergey Kolekonov <skolekonov@mirantis.com>  Wed, 30 Sep 2015 15:31:57 +0300
 
+neutron (1:7.0.0-2) unstable; urgency=medium
+
+  * Delete openvswitch_agent.ini on purge (Closes: #802538).
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 23 Oct 2015 12:25:25 +0200
+
+neutron (1:7.0.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Uploading to unstable.
+  * Added python-pymysql as runtime dependency.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 13 Oct 2015 15:05:52 +0200
+
 neutron (1:7.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/control b/trusty/debian/control
index b426d96b38e3cbfd4510adde0c7a25e137e1647b..28742bec8644e501fd044d3e5555c87284917f28 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -7,6 +7,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
+               git,
                openstack-pkg-tools (>= 23~),
                po-debconf,
                python-all,
@@ -15,9 +16,9 @@ Build-Depends: debhelper (>= 9),
                python-sphinx,
 Build-Depends-Indep: alembic (>= 0.8.0),
                      bridge-utils,
-                     python-cliff (>= 1.14.0),
+                     python-cliff (>= 1.15.0),
                      python-coverage,
-                     python-ddt (>= 0.7.0),
+                     python-ddt (>= 1.0.1),
                      python-debtcollector (>= 0.3.0),
                      python-eventlet (>= 0.17.4),
                      python-fixtures (>= 1.3.1),
@@ -25,43 +26,45 @@ Build-Depends-Indep: alembic (>= 0.8.0),
                      python-greenlet,
                      python-hacking,
                      python-httplib2,
-                     python-jinja2,
+                     python-jinja2 (>= 2.8),
                      python-keystoneclient (>= 1:1.6.0),
-                     python-keystonemiddleware (>= 2.0.0),
+                     python-keystonemiddleware (>= 4.0.0),
                      python-mock (>= 1.3),
                      python-netaddr (>= 0.7.12),
                      python-neutronclient (>= 1:2.6.0),
-                     python-novaclient (>= 2:2.27.0),
-                     python-os-testr,
+                     python-novaclient (>= 2:2.30.1),
+                     python-os-testr (>= 0.4.2),
                      python-oslo.concurrency (>= 2.3.0),
-                     python-oslo.config (>= 1:2.3.0),
+                     python-oslo.config (>= 1:3.2.0),
                      python-oslo.context (>= 0.2.0),
-                     python-oslo.db (>= 2.4.1),
+                     python-oslo.db (>= 4.1.0),
                      python-oslo.i18n (>= 1.5.0),
-                     python-oslo.log (>= 1.8.0),
-                     python-oslo.messaging (>= 1.16.0),
-                     python-oslo.middleware (>= 2.8.0),
+                     python-oslo.log (>= 2.0.0),
+                     python-oslo.messaging (>= 3.0.0),
+                     python-oslo.middleware (>= 3.0.0),
                      python-oslo.policy (>= 0.5.0),
                      python-oslo.rootwrap (>= 2.0.0),
-                     python-oslo.serialization (>= 1.4.0),
-                     python-oslo.service (>= 0.8.0),
-                     python-oslo.utils (>= 2.0.0),
-                     python-oslo.versionedobjects (>= 0.9.0),
+                     python-oslo.serialization (>= 2.0.0),
+                     python-oslo.service (>= 1.0.0),
+                     python-oslo.utils (>= 3.4.0),
+                     python-oslo.versionedobjects (>= 1.0.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.10.0),
                      python-paste,
                      python-pastedeploy,
                      python-pecan (>= 1.0.0),
                      python-pyudev,
-                     python-requests (>= 2.5.2),
-                     python-requests-mock (>= 0.6.0),
+                     python-pymysql,
+                     python-requests (>= 2.8.1),
+                     python-requests-mock (>= 0.7.0),
                      python-retrying,
                      python-routes,
                      python-ryu (>= 3.24),
                      python-six (>= 1.9.0),
-                     python-sqlalchemy (>= 0.9.9),
+                     python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
-                     python-tempest-lib (>= 0.8.0),
+                     python-tempest-lib (>= 0.13.0),
+                     python-testresources,
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
                      python-unittest2,
@@ -86,46 +89,51 @@ Depends: alembic (>= 0.8.0),
          python-gflags,
          python-greenlet,
          python-httplib2,
-         python-jinja2,
+         python-jinja2 (>= 2.8),
          python-keystoneclient (>= 1:1.6.0),
-         python-keystonemiddleware (>= 2.0.0),
+         python-keystonemiddleware (>= 4.0.0),
          python-mysqldb,
          python-netaddr (>= 0.7.12),
          python-neutronclient (>= 1:2.6.0),
-         python-novaclient (>= 2:2.27.0),
+         python-novaclient (>= 2:2.30.1),
          python-openvswitch,
          python-oslo.concurrency (>= 2.3.0),
-         python-oslo.config (>= 1:2.3.0),
+         python-oslo.config (>= 1:3.2.0),
          python-oslo.context (>= 0.2.0),
-         python-oslo.db (>= 2.4.1),
+         python-oslo.db (>= 4.1.0),
          python-oslo.i18n (>= 1.5.0),
-         python-oslo.log (>= 1.8.0),
-         python-oslo.messaging (>= 1.16.0),
-         python-oslo.middleware (>= 2.8.0),
+         python-oslo.log (>= 2.0.0),
+         python-oslo.messaging (>= 3.0.0),
+         python-oslo.middleware (>= 3.0.0),
          python-oslo.policy (>= 0.5.0),
          python-oslo.rootwrap (>= 2.0.0),
-         python-oslo.serialization (>= 1.4.0),
-         python-oslo.service (>= 0.8.0),
-         python-oslo.utils (>= 2.0.0),
-         python-oslo.versionedobjects (>= 0.9.0),
+         python-oslo.serialization (>= 2.0.0),
+         python-oslo.service (>= 1.0.0),
+         python-oslo.utils (>= 3.4.0),
+         python-oslo.versionedobjects (>= 1.0.0),
          python-paste,
          python-pastedeploy,
          python-pecan (>= 1.0.0),
          python-pbr (>= 1.8),
          python-psycopg2,
+         python-pymysql,
          python-pyroute2,
          python-pyudev,
-         python-requests (>= 2.5.2),
+         python-requests (>= 2.8.1),
          python-retrying,
          python-routes,
          python-ryu (>= 3.24),
          python-six (>= 1.9.0),
-         python-sqlalchemy (>= 0.9.9),
+         python-sqlalchemy (>= 1.0.10),
          python-stevedore (>= 1.5.0),
          python-webob,
          ${misc:Depends},
          ${python:Depends},
 Recommends: iputils-arping,
+Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+          neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
+Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+        neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
 Provides: ${python:Provides},
 Description: OpenStack virtual network service - Python library
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -161,7 +169,7 @@ Depends: adduser,
          dpkg-dev,
          python-mysqldb,
          python-neutron (= ${source:Version}),
-         python-pyparsing (>=1.5.7),
+         python-pyparsing (>=2.0.1),
          python-sqlalchemy,
          sqlite3,
          ${misc:Depends},
@@ -180,6 +188,10 @@ Provides: neutron-plugin,
           neutron-plugin-plumgrid,
           neutron-plugin-ryu,
           python-argparse,
+Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+          neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
+Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+        neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
 Description: OpenStack virtual network service - common files
  Neutron provides an API to dynamically request and configure virtual networks.
  These networks connect "interfaces" from other OpenStack services (such as
@@ -210,8 +222,8 @@ Depends: adduser,
          debconf,
          iputils-arping,
          keepalived,
-         radvd,
          neutron-common (= ${source:Version}),
+         radvd,
          sudo,
          ${misc:Depends},
          ${python:Depends},
@@ -277,9 +289,12 @@ Description: OpenStack virtual network service - metering agent
  .
  This package provides the Neutron metering agent.
 
-Package: neutron-plugin-openvswitch-agent
+Package: neutron-openvswitch-agent
 Architecture: all
 Pre-Depends: openvswitch-switch (>= 1.9),
+Replaces: neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
+Breaks: neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
+Provides: neutron-plugin-openvswitch-agent,
 Depends: neutron-common (= ${source:Version}),
          sudo,
          ${misc:Depends},
@@ -295,8 +310,11 @@ Description: OpenStack virtual network service - Open vSwitch agent
  This package provides the Open vSwitch agent. If you choose to use the Open
  vSwitch plugin on neutron-server, this agent should run on each compute node.
 
-Package: neutron-plugin-linuxbridge-agent
+Package: neutron-linuxbridge-agent
 Architecture: all
+Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
+Provides: neutron-plugin-linuxbridge-agent,
 Depends: bridge-utils,
          neutron-common (= ${source:Version}),
          sudo,
@@ -312,164 +330,36 @@ Description: OpenStack virtual network service - Linux bridge agent
  This package provides the Linux bridge agent. If you choose to use the Linux
  bridge plugin on neutron-server, this agent should run on each compute node.
 
-Package: neutron-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: Neutron is a virtual network service for Openstack - Docs
- 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
-
-Package: neutron-plugin-ml2
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - ML2 plugin
- 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 Modular Layer 2 plugin.
-
-Package: neutron-plugin-cisco
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Cisco plugin
- 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 Cisco plugin.
-
-Package: neutron-plugin-bigswitch
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - BigSwitch plugin
- 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 BigSwitch plugin.
-
-Package: neutron-plugin-bigswitch-agent
-Architecture: all
-Depends: neutron-plugin-bigswitch (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - BigSwitch plugin 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 BigSwitch plugin agent.
-
-Package: neutron-plugin-brocade
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
+Package: neutron-plugin-linuxbridge-agent
+Depends: neutron-linuxbridge-agent,
          ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Brocade plugin
- 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 Brocade plugin.
-
-Package: neutron-plugin-metaplugin
 Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Metaplugin plugin
- 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 Metaplugin plugin.
+Section: oldlibs
+description: transitional dummy package for switching to Neutron Linuxbridge agent.
+ This is a transitional dummy package due to the move of the Linuxbridge agent from
+ core plugin to ML2 MechanismDriver.
+ Once you have upgraded, this package can safely be removed. This package provides a
+ transition path from neutron-plugin-linuxbridge-agent to neutron-linuxbridge-agent.
 
-Package: neutron-plugin-midonet
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
+Package: neutron-plugin-openvswitch-agent
+Depends: neutron-openvswitch-agent,
          ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Midonet plugin
- 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 Midonet plugin.
-
-Package: neutron-plugin-mlnx
 Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Mellanox plugin
- 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 Mellanox plugin.
+Section: oldlibs
+description: transitional dummy package for switching to Neutron OpenVswitch agent.
+ This is a transitional dummy package due to the move of the OpenVswitch agent from
+ core plugin to ML2 MechanismDriver.
+ Once you have upgraded, this package can safely be removed. This package provides a
+ transition path from neutron-plugin-openvswitch-agent to neutron-openvswitch-agent.
 
-Package: neutron-plugin-mlnx-agent
+Package: neutron-plugin-ml2
 Architecture: all
 Provides: neutron-plugin,
 Depends: neutron-common (= ${source:Version}),
-         neutron-plugin-mlnx,
          ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Mellanox plugin agent
+         ${python:Depends},
+         ${shlibs:Depends},
+Description: Neutron is a virtual network service for Openstack - ML2 plugin
  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
@@ -479,12 +369,14 @@ Description: Neutron is a virtual network service for Openstack - Mellanox plugi
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the Mellanox plugin agent.
+ This package provides the Modular Layer 2 plugin.
 
 Package: neutron-plugin-sriov-agent
 Architecture: all
 Depends: neutron-plugin-ml2 (= ${source:Version}),
          ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends},
 Description: Neutron is a virtual network service for Openstack - IBM agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -497,62 +389,11 @@ Description: Neutron is a virtual network service for Openstack - IBM agent
  .
  This package provides the Mellanox SR-IOV agent.
 
-Package: neutron-plugin-oneconvergence
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - One Convergence plugin
- 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 One Convergence plugin.
-
-Package: neutron-plugin-oneconvergence-agent
-Architecture: all
-Depends: neutron-plugin-oneconvergence (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - One Convergence 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 One Convergence agent.
-
-Package: neutron-plugin-nuage
-Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - Nuage plugin
- 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 Nuage plugin.
-
-Package: neutron-plugin-opencontrail
+Package: neutron-doc
 Architecture: all
-Provides: neutron-plugin,
-Depends: neutron-common (= ${source:Version}),
-         ${misc:Depends},
-Description: Neutron is a virtual network service for Openstack - OpenContrail plugin
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Neutron is a virtual network service for Openstack - Docs
  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
@@ -562,4 +403,4 @@ Description: Neutron is a virtual network service for Openstack - OpenContrail p
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the OpenContail plugin.
+ This package contains the documentation

diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf
index 7da944a9d0264f223053c1bd3ae0723caa42b81f..c737cbbfb6d7a8df6ccb41a5d9bf6f3397635a49 100644 (file)
--- a/trusty/debian/gbp.conf
+++ b/trusty/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/liberty
+debian-branch = debian/mitaka
 upstream-tag = %(version)s
 compression = xz
 

diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 7b813dc3bce4a8153d5a482fe29ac06482a963e9..c9010ea71e2cc7cb8985d102c26d70409484b2f1 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -112,7 +112,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        db_stop
 
        chown -R neutron:adm /var/log/neutron/
-       chmod 0750 /etc/neutron
+       chmod 0700 /etc/neutron
        chmod 0750 /var/log/neutron/
        chown root:root /etc/neutron/rootwrap.conf
        chown root:root /etc/neutron/rootwrap.d

diff --git a/trusty/debian/neutron-common.postrm b/trusty/debian/neutron-common.postrm
index 75520af18df881e978987226ea3f6861409fabc7..7a6bbe2346dce55cee122d5a0264e2a6228d24da 100644 (file)
--- a/trusty/debian/neutron-common.postrm
+++ b/trusty/debian/neutron-common.postrm
@@ -23,7 +23,7 @@ if [ "${1}" = "purge" ] ; then
 
        # Clean /etc/neutron on purge
        rm -f /etc/default/neutron /etc/neutron/api-paste.ini /etc/neutron/neutron.conf \
-                       /etc/neutron/plugins/openvswitch/ml2/openvswitch_agent.ini
+                       /etc/neutron/plugins/ml2/openvswitch_agent.ini
        [ -d /etc/neutron/plugins/ml2 ]         && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins/ml2
        [ -d /etc/neutron/plugins ]             && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins
        [ -d /etc/neutron ]                     && rmdir --ignore-fail-on-non-empty /etc/neutron

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.init.in b/trusty/debian/neutron-linuxbridge-agent.init.in
similarity index 96%
rename from trusty/debian/neutron-plugin-linuxbridge-agent.init.in
rename to trusty/debian/neutron-linuxbridge-agent.init.in
index 7540ba052c3605d6b72dc30f8e636919c8fe9326..da1fdb02a0151b774617505b90945ddea34480d9 100644 (file)
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
+++ b/trusty/debian/neutron-linuxbridge-agent.init.in
@@ -25,6 +25,5 @@ NAME=${PROJECT_NAME}-linuxbridge-agent
 # replaced by ml2 as core_plugin and lb as agent. Making ml2 mandatory
 # to use this agent
 
-DAEMON=/usr/bin/neutron-linuxbridge-agent
 DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
 

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.manpages b/trusty/debian/neutron-linuxbridge-agent.manpages
similarity index 100%
rename from trusty/debian/neutron-plugin-linuxbridge-agent.manpages
rename to trusty/debian/neutron-linuxbridge-agent.manpages

diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.init.in b/trusty/debian/neutron-openvswitch-agent.init.in
similarity index 96%
rename from trusty/debian/neutron-plugin-openvswitch-agent.init.in
rename to trusty/debian/neutron-openvswitch-agent.init.in
index eeef95e4001d7c568eb196bd47e085da3c42b59a..bc6af291d3f3e40421c8c2481596af98e6c39f53 100644 (file)
--- a/trusty/debian/neutron-plugin-openvswitch-agent.init.in
+++ b/trusty/debian/neutron-openvswitch-agent.init.in
@@ -21,5 +21,4 @@ CONFIG_FILE=/etc/neutron/plugins/ml2/openvswitch_agent.ini
 # Since Juno OVS plugin as been deprecated as core_plugin, it has been
 # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory
 # to use this agent
-DAEMON=/usr/bin/neutron-openvswitch-agent
 DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"

diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.manpages b/trusty/debian/neutron-openvswitch-agent.manpages
similarity index 100%
rename from trusty/debian/neutron-plugin-openvswitch-agent.manpages
rename to trusty/debian/neutron-openvswitch-agent.manpages

diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in b/trusty/debian/neutron-openvswitch-agent.upstart.in
similarity index 100%
rename from trusty/debian/neutron-plugin-openvswitch-agent.upstart.in
rename to trusty/debian/neutron-openvswitch-agent.upstart.in

diff --git a/trusty/debian/neutron-plugin-bigswitch-agent.init.in b/trusty/debian/neutron-plugin-bigswitch-agent.init.in
deleted file mode 100644 (file)
index bcfb75b..0000000
--- a/trusty/debian/neutron-plugin-bigswitch-agent.init.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          neutron-plugin-bigswitch-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 Bigswitch Agent
-# Description:       BigSwitch SDN agent for OpenStack Neutron
-### END INIT INFO
-
-# Authors: James Page <james.page@ubuntu.com>
-
-DESC="Openstack Neutron BigSwitch Plugin Agent"
-PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-plugin-bigswitch-agent
-DAEMON=/usr/bin/neutron-restproxy-agent
-# --config-file=/etc/neutron/neutron.conf will be happened 
-# to DAEMON_ARGS later by openstack-pkg-tools
-DAEMON_ARGS="--config-file=/etc/neutron/plugins/bigswitch/restproxy.ini"

diff --git a/trusty/debian/neutron-plugin-mlnx-agent.init.in b/trusty/debian/neutron-plugin-mlnx-agent.init.in
deleted file mode 100644 (file)
index 902ad57..0000000
--- a/trusty/debian/neutron-plugin-mlnx-agent.init.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          neutron-plugin-mlnx-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 Mellanox Agent
-# Description:       Mellanox SDN agent for OpenStack Neutron
-### END INIT INFO
-
-# Authors: James Page <james.page@ubuntu.com>
-
-DESC="OpenStack Neutron Mellanox Plugin Agent"
-PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-plugin-mlnx-agent
-# --config-file=/etc/neutron/neutron.conf will be happened 
-# to DAEMON_ARGS later by openstack-pkg-tools
-DAEMON_ARGS="--config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini"

diff --git a/trusty/debian/neutron-plugin-oneconvergence-agent.init.in b/trusty/debian/neutron-plugin-oneconvergence-agent.init.in
deleted file mode 100644 (file)
index 1d77c17..0000000
--- a/trusty/debian/neutron-plugin-oneconvergence-agent.init.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          neutron-plugin-oneconvergence-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 One Convergence Agent
-# Description:       One Convergence SDN agent for OpenStack Neutron
-### END INIT INFO
-
-# Authors: James Page <james.page@ubuntu.com>
-
-DESC="OpenStack Neutron One Convergence Plugin Agent"
-PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-plugin-oneconvergence-agent
-DAEMON=/usr/bin/neutron-nvsd-agent
-# --config-file=/etc/neutron/neutron.conf will be happened 
-# to DAEMON_ARGS later by openstack-pkg-tools
-DAEMON_ARGS="--config-file=/etc/neutron/plugins/oneconvergence/nvsdplugin.ini"

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 4eb03b658b72a2a714ff3ba28126d018d3627a7e..305551355713c23cb201909a73b6458622ad0c0e 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -24,6 +24,9 @@ override_dh_install:
                mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
                cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
        done
+       tools/generate_config_file_samples.sh
+       bash -c 'for i in $$(find etc/ -name *.ini.sample); do mv $$i $$(dirname $$i)/$$(basename "$$i" .ini.sample).ini; done'
+       mv etc/neutron.conf.sample etc/neutron.conf
        dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin
        rm -rf $(CURDIR)/debian/neutron-common/usr/lib
        rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum*
@@ -75,7 +78,7 @@ override_dh_auto_build:
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-        python setup.py build_sphinx
-        cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
-        dh_sphinxdoc -O--buildsystem=python_distutils
+       python setup.py build_sphinx
+       cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
+       dh_sphinxdoc -O--buildsystem=python_distutils
 endif