neutron (1:2014.2.2-fuel6.1-14.04-1) trusty; urgency=medium
- * Specs backported from Ubuntu 14.10
+ * Updated specs for Ubuntu 14.04
-- Sergey Kolekonov <skolekonov@mirantis.com> Fri, 20 Feb 2015 18:10:43 +0300
Source: neutron
Section: net
Priority: optional
-Maintainer: MOS Neutron team <mos-neutron@mirantis.com>
+Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
Build-Depends-Indep:
alembic (>= 0.6.4),
python-anyjson (>= 0.3.3),
python-babel (>= 1.3),
- python-cliff (>= 1.6.0),
+ python-cliff (>= 1.7.0),
python-coverage,
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.1),
python-fixtures (>= 0.3.14),
python-greenlet (>= 0.3.2),
python-hacking (>= 0.9.2),
python-neutronclient (>= 1:2.3.6),
python-novaclient (>= 1:2.18.0),
python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 0.4.0),
+ python-oslo.db (>= 1.0.0),
python-oslo.messaging (>= 1.4.0),
python-oslo.rootwrap (>= 1.3.0),
python-paste,
python-simplejson,
python-six (>= 1.7.0),
python-sqlalchemy (>= 0.8.4),
- python-stevedore (>= 0.14),
+ python-stevedore (>= 1.0.0),
python-testtools (>= 0.9.34),
python-webob (>= 1.2.3),
python-webtest (>= 2.0),
Architecture: all
Depends:
adduser,
+ conntrack,
neutron-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
Architecture: all
Depends:
adduser,
- ipset,
python-neutron (= ${source:Version}),
${misc:Depends},
${python:Depends}
Architecture: all
Depends:
iputils-arping,
- keepalived,
neutron-common (= ${source:Version}),
neutron-metadata-agent (= ${source:Version}),
- radvd,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
alembic (>= 0.6.4),
python-anyjson (>= 0.3.3),
python-babel (>= 1.3),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.0),
python-greenlet (>= 0.3.2),
python-httplib2 (>= 0.7.5),
python-iso8601 (>= 0.1.9),
python-jsonrpclib,
python-keystoneclient (>= 1:0.10.0),
python-keystonemiddleware (>= 1.0.0),
- python-kombu (>= 2.4.8),
+ python-kombu (>= 3.0.7),
python-netaddr (>= 0.7.12),
python-neutronclient (>= 1:2.3.6),
python-novaclient (>= 1:2.18.0),
python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 0.4.0),
+ python-oslo.db (>= 1.0.0),
python-oslo.messaging (>= 1.4.0),
python-oslo.rootwrap (>= 1.3.0),
python-paste,
python-routes (>= 1.12.3),
python-six (>= 1.7.0),
python-sqlalchemy (>= 0.8.4),
- python-stevedore (>= 0.14),
+ python-stevedore (>= 1.0.0),
python-webob (>= 1.2.3),
${misc:Depends},
${python:Depends}
Package: neutron-plugin-openvswitch
Architecture: all
-Section: oldlibs
-Priority: extra
+Provides: neutron-plugin
Depends:
- neutron-plugin-ml2,
+ neutron-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package is a transitional package to migrate openvswitch plugin
- users to the Modular Layer 2 (ml2) plugin.
+ This package provides the Open vSwitch plugin.
Package: neutron-plugin-ml2
Architecture: all
Package: neutron-plugin-openvswitch-agent
Architecture: all
Depends:
+ ipset,
neutron-plugin-ml2 (= ${source:Version}),
openvswitch-switch,
${misc:Depends},
Package: neutron-plugin-linuxbridge
Architecture: all
-Section: oldlibs
-Priority: extra
+Provides: neutron-plugin
Depends:
- neutron-plugin-ml2,
+ neutron-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package is a transitional package to migrate linuxbridge plugin
- users to the Modular Layer 2 (ml2) plugin.
+ This package provides the linuxbridge plugin.
Package: neutron-plugin-linuxbridge-agent
Architecture: all
Depends:
bridge-utils,
- neutron-plugin-ml2 (= ${source:Version}),
+ neutron-plugin-linuxbridge (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
.
This package provides the IBM agent.
-Package: neutron-plugin-sriov-agent
-Architecture: all
-Depends:
- neutron-common (= ${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
- 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 SR-IOV agent.
-
Package: neutron-plugin-oneconvergence
Architecture: all
Provides: neutron-plugin
etc.)
.
This package provides the One Convergence agent.
-
-Package: neutron-plugin-nuage
-Architecture: all
-Provides: neutron-plugin
-Depends:
- neutron-common (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs: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
-Architecture: all
-Provides: neutron-plugin
-Depends:
- neutron-common (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Description: Neutron is a virtual network service for Openstack - OpenContrail 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 OpenContail plugin.
etc/l3_agent.ini etc/neutron
etc/neutron.conf etc/neutron
etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
-etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
+etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
etc/policy.json etc/neutron
etc/rootwrap.conf etc/neutron
etc/vpn_agent.ini etc/neutron
usr/bin/neutron-ovs-cleanup usr/bin
usr/bin/neutron-rootwrap usr/bin
usr/bin/neutron-rootwrap-xen-dom0 usr/bin
-usr/bin/neutron-sanity-check usr/bin
usr/bin/neutron-usage-audit usr/bin
+usr/bin/neutron-sanity-check usr/bin
+usr/bin/neutron-sriov-nic-agent usr/bin
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron OpenvSwitch cleanup"
+author "Andrey Korolev <akorolev@mirantis.com>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+emits neutron-ovs-cleanup
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/neutron-ovs-cleanup
+ chown neutron:neutron /var/run/neutron-ovs-cleanup
+ mkdir -p /var/lock/neutron-ovs-cleanup
+ chown neutron:root /var/lock/neutron-ovs-cleanup
+ /usr/bin/neutron-ovs-cleanup --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
+end script
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
--- /dev/null
+etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge
+++ /dev/null
-etc/neutron/plugins/nuage/* etc/neutron/plugins/nuage
+++ /dev/null
-etc/neutron/plugins/opencontrail/* etc/neutron/plugins/opencontrail
description "Neutron OpenvSwitch Plugin Agent"
author "Chuck Short <zulcss@ubuntu.com>"
-start on runlevel [2345] and started neutron-ovs-cleanup
+start on neutron-ovs-cleanup or runlevel [2345]
stop on runlevel [!2345]
respawn
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/ovs-agent.log
--- /dev/null
+etc/neutron/plugins/openvswitch/* etc/neutron/plugins/openvswitch
+++ /dev/null
-usr/bin/neutron-sriov-nic-agent usr/bin
+++ /dev/null
-/var/log/neutron/sriov-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
+++ /dev/null
-# vim:set ft=upstart ts=2 et:
-description "Neutron SRIOV SDN Agent"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-chdir /var/run
-
-pre-start script
- mkdir -p /var/run/neutron
- chown neutron:root /var/run/neutron
-end script
-
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/usr/bin/neutron-sriov-nic-agent -- \
- --config-file=/etc/neutron/neutron.conf \
- --config-file=/etc/neutron/plugins/ml2/ml2_conf_sriov \
- --log-file=/var/log/neutron/sriov-agent.log
# path to config file corresponding to the core_plugin specified in
# neutron.conf
-NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini"
+NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugin.ini"
-From 9ea16ee22824bf1ee5a296c112f7857cd6afe226 Mon Sep 17 00:00:00 2001
-From: Chuck Short <chuck.short@canonical.com>
-Date: Fri, 29 Aug 2014 13:54:15 -0400
-Subject: [PATCH] fix
-
-Signed-off-by: Chuck Short <chuck.short@canonical.com>
----
- neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py | 3 +++
- neutron/tests/unit/test_agent_linux_utils.py | 1 +
- neutron/tests/unit/test_db_plugin.py | 2 ++
- 3 files changed, 6 insertions(+)
-
+diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+index c367710..09c3d46 100644
--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-@@ -44,6 +44,7 @@ class FakeIpDevice(object):
+@@ -48,6 +48,7 @@ class FakeIpDevice(object):
class TestLinuxBridge(base.BaseTestCase):
def setUp(self):
super(TestLinuxBridge, self).setUp()
interface_mappings = {'physnet1': 'eth1'}
root_helper = cfg.CONF.AGENT.root_helper
-@@ -92,6 +93,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+@@ -96,6 +97,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
def setUp(self):
super(TestLinuxBridgeAgent, self).setUp()
# disable setting up periodic state reporting
cfg.CONF.set_override('report_interval', 0, 'AGENT')
-@@ -343,6 +345,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+@@ -218,6 +220,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
class TestLinuxBridgeManager(base.BaseTestCase):
def setUp(self):
super(TestLinuxBridgeManager, self).setUp()
self.interface_mappings = {'physnet1': 'eth1'}
self.root_helper = cfg.CONF.AGENT.root_helper
---- a/neutron/tests/unit/test_agent_linux_utils.py
-+++ b/neutron/tests/unit/test_agent_linux_utils.py
-@@ -35,6 +35,7 @@ class FakeCreateProcess(object):
-
- class AgentUtilsExecuteTest(base.BaseTestCase):
- def setUp(self):
-+ self.skipTest('Skipped by Ubuntu')
- super(AgentUtilsExecuteTest, self).setUp()
- self.root_helper = "echo"
- self.test_file = self.useFixture(
---- a/neutron/tests/unit/test_db_plugin.py
-+++ b/neutron/tests/unit/test_db_plugin.py
-@@ -930,6 +930,7 @@ class TestPortsV2(NeutronDbPluginV2TestC
- self._test_list_resources('port', ports)
-
- def test_list_ports_filtered_by_fixed_ip(self):
-+ self.skipTest('Skipped by Ubuntu')
- # for this test we need to enable overlapping ips
- cfg.CONF.set_default('allow_overlapping_ips', True)
- with contextlib.nested(self.port(), self.port()) as (port1, port2):
-@@ -1937,6 +1938,7 @@ class TestNetworksV2(NeutronDbPluginV2Te
- self.assertEqual(res.status_int, webob.exc.HTTPCreated.code)
-
- def test_create_networks_bulk_tenants_and_quotas_fail(self):
-+ self.skipTest('Skipped by Ubuntu')
- if self._skip_native_bulk:
- self.skipTest("Plugin does not support native bulk network create")
- quota = 2
+
+diff --git a/etc/neutron.conf b/etc/neutron.conf
+index 31977a8..62a0e14 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
-@@ -60,7 +60,7 @@ lock_path = $state_path/lock
+@@ -50,7 +50,7 @@ lock_path = $state_path/lock
# previous versions, the class name of a plugin can be specified instead of its
# entrypoint name.
#
# Example: core_plugin = ml2
# (ListOpt) List of service plugin entrypoints to be loaded from the
-@@ -543,7 +543,7 @@ lock_path = $state_path/lock
+@@ -389,7 +389,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
# =========== items for agent management extension =============
# seconds between nodes reporting state to server; should be less than
-@@ -566,7 +566,7 @@ admin_password = %SERVICE_PASSWORD%
+@@ -412,7 +412,7 @@ admin_password = %SERVICE_PASSWORD%
# connection = mysql://root:pass@127.0.0.1:3306/neutron
# Replace 127.0.0.1 above with the IP address of the database used by the
# main neutron server. (Leave it as is if the database runs on this host.)
# NOTE: In deployment the [database] section and its connection attribute may
# be set in the corresponding core plugin '.ini' file. However, it is suggested
# to put the [database] section and its connection attribute in this
+--
+2.0.0
+
--- /dev/null
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
+@@ -7,7 +7,7 @@
+
+ # Where to store Neutron state files. This directory must be writable by the
+ # user executing the agent.
+-# state_path = /var/lib/neutron
++state_path = /var/lib/neutron
+
+ # Where to store lock files
+ lock_path = $state_path/lock
+@@ -50,7 +50,7 @@
+ # previous versions, the class name of a plugin can be specified instead of its
+ # entrypoint name.
+ #
+-# core_plugin =
++core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
+ # Example: core_plugin = ml2
+
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -490,6 +490,7 @@
+ # root filter facility.
+ # Change to "sudo" to skip the filtering and just run the comand directly
+ # root_helper = sudo
++root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+
+ # =========== items for agent management extension =============
+ # seconds between nodes reporting state to server; should be less than
+@@ -512,7 +513,7 @@
+ # connection = mysql://root:pass@127.0.0.1:3306/neutron
+ # Replace 127.0.0.1 above with the IP address of the database used by the
+ # main neutron server. (Leave it as is if the database runs on this host.)
+-# connection = sqlite://
++connection = sqlite:////var/lib/neutron/neutron.sqlite
+ # NOTE: In deployment the [database] section and its connection attribute may
+ # be set in the corresponding core plugin '.ini' file. However, it is suggested
+ # to put the [database] section and its connection attribute in this
fix-neutron-configuration.patch
disable-udev-tests.patch
-#skip-pagination.patch
# with a core_plugin being set.
patch -p1 -R < debian/patches/fix-neutron-configuration.patch
# Set a reasonable level of concurrency
- ./run_tests.sh -N -P
+ ./run_tests.sh -N -P --concurrency=4
# Patch configuration file after testing
patch -p1 < debian/patches/fix-neutron-configuration.patch
endif
apt-get -y install neutron-plugin-openvswitch
# update plugin path
-sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/openvswitch\/ovs_neutron_plugin\.ini\"/g' /etc/default/neutron-server
sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/g' /etc/neutron/neutron.conf
service neutron-server restart > /dev/null 2>&1
if pidof -x neutron-server > /dev/null; then
Code Review / openstack-build / neutron-build.git / commitdiff