+++ /dev/null
-neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low
-
- Quantum has been renamed to Neutron during the Havana development cycle.
-
- Please review changed configuration in /etc/quantum and apply to new
- configuration files in /etc/neutron.
-
- -- James Page <james.page@ubuntu.com> Thu, 18 Jul 2013 10:07:15 +0100
-neutron (1:2013.2-0ubuntu1~cloud0) precise-havana; urgency=low
+neutron (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
- * New usptream release candidate for the Ubuntu Cloud Archive.
+ * New upstream release.
+ * debian/patches/fix-neutron-configuration.patch: Refreshed
+ * debian/control:
+ - Removed python-d2to1 build dependency.
+ - Add python-hacking build dependency.
+ - Add python-oslo.messaging as a build dependency.
+ - Add python-oslo.db as a build dependency.
+
+ -- Chuck Short <zulcss@ubuntu.com> Fri, 25 Jul 2014 11:06:46 -0400
+
+neutron (1:2014.2~b1-0ubuntu3) utopic; urgency=medium
+
+ * SECURITY UPDATE: specify /etc/neutron/rootwrap.conf for use with
+ nova-rootwrap
+ - CVE-2013-1068 (LP: #1185019)
+
+ -- Chuck Short <zulcss@ubuntu.com> Wed, 18 Jun 2014 12:43:51 -0400
+
+neutron (1:2014.2~b1-0ubuntu2) utopic; urgency=medium
+
+ * debian/tests/neutron-daemons: Dont test neutron-lbaas since
+ it needs to be configured properly in order to run the tests.
+ (LP: #1240712)
+
+ -- Chuck Short <zulcss@ubuntu.com> Fri, 13 Jun 2014 10:25:04 -0400
+
+neutron (1:2014.2~b1-0ubuntu1) utopic; urgency=medium
+
+ [ Chuck Short ]
+ * debian/control: Open up juno release
+ * debian/patches/fix-quantum-configuration.patch: Refreshed
+ * debian/patches/disable-udev-tests.patch: Refreshed
+ * debian/patches/disable-failing-metaplugin-tests.patch: Dropped
+ * debian/patches/skip-lb-test.patch: Dropped
+ * debian/patches/skip-ipv6-tests.patch: Dropped
+ * debian/control: Add pep8 as a dependency.
+ * debian/patches/use-concurrency.patch: Dropped
+ * debian/neutron-common.dirs: Add lock directory.
+ * debian/neutron-plugin-vmware.install: Dropped neutron-check-nvp-config.
+ * debian/rules: Remove last bits of quantum.
+ * debian/neutron-common.install: Add neutron-sanity-check.
+
+ [ Adrien Cunin ]
+ * Renamed patch debian/patches/fix-{quantum,neutron}-configuration.patch
+ * Removed references to Quantum in debian/cron.d/*'s comments
+ * Removed debian/NEWS as it was only mentioning the now finished
+ quantum/neutron name transition
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 12 Jun 2014 15:10:36 -0400
+
+neutron (1:2014.1-0ubuntu3) utopic; urgency=medium
+
+ * Add allow-stderr autopkgtest restriction for the dpkg error spew.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 13 May 2014 09:37:40 +0200
+
+neutron (1:2014.1-0ubuntu2) utopic; urgency=medium
+
+ * Rebuild for sqlalchemy 0.9.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 08 May 2014 11:24:37 -0500
+
+
+neutron (1:2014.1-0ubuntu1) trusty; urgency=medium
+
+ [ Chuck Short ]
+ * New upstream release (LP: #1288245).
+
+ -- James Page <james.page@ubuntu.com> Thu, 17 Apr 2014 13:04:17 +0100
+
+neutron (1:2014.1~rc2-0ubuntu4) trusty; urgency=medium
+
+ * d/neutron-vpn-agent.upstart: Wait for neutron-ovs-cleanup service to
+ start if installed to ensure that Open vSwitch state is cleaned up
+ on reboot (LP: #1307208).
+
+ -- James Page <james.page@ubuntu.com> Mon, 14 Apr 2014 11:07:44 +0100
+
+neutron (1:2014.1~rc2-0ubuntu3) trusty; urgency=medium
+
+ * Fix the Breaks/Replaces from the previous version, as they were
+ accidentally added to the wrong package (and with the wrong versioning).
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 10 Apr 2014 23:36:09 +0000
+
+neutron (1:2014.1~rc2-0ubuntu2) trusty; urgency=medium
+
+ * Ensure that VPN and L3 agents are not installed together (LP: #1303876):
+ - d/control: Add Conflicts on neutron-l3-agent to neutron-vpn-agent,
+ drop dependency from neutron-vpn-agent -> neutron-l3-agent.
+ - d/neutron-{common,vpn-agent,l3-agent}.install: Move configuration and
+ rootwrap filters to -common package for use by both agent types.
+ - d/control: Add appropriate Breaks/Replaces for config file moves.
+ - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file
+ path inline with l3-agent configuration.
+ - d/control: Align Depends of neutron-vpn-agent with neutron-l3-agent.
+
+ -- James Page <james.page@ubuntu.com> Thu, 10 Apr 2014 14:34:18 +0100
+
+neutron (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
+
+ [ James Page ]
+ * d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart
+ configuration to match package name (LP: #1301957).
+ * d/neutron-vpn-agent.install: Install missing vpnaas.filters for
+ rootwrap (LP: #1303876).
+
+ [ Chuck Short ]
+ * New upstream release candidate (LP: #1288245).
+
+ -- Chuck Short <zulcss@ubuntu.com> Wed, 09 Apr 2014 08:51:40 -0400
+
+neutron (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium
+
+ [ Chuck Short ]
+ * debian/rules: Run testr init before tests.
+ * debian/patches/disable-udev-tests.patch: Refresh.
+ * d/control,neutron-plugin-oneconvergence*: Add One Convergence plugin
+ and agent (LP: #1293632).
+
+ [ James Page ]
+ * New upstream release candidate (LP: #1288696, #1291535).
+ * d/control,neutron-mlnx-plugin{-agent}.install: Split out Mellanox
+ plugin configuration from agent package (LP: #1255420).
+ * d/control,neutron-{plugin-}{vpn|metering}-agent.*: Drop -plugin from
+ metering and vpn agents (they are not plugins) and deal with associated
+ change in name of upstart configurations.
+ * d/neutron-l3-agent.{install,upstart}: Install fwaas_driver.ini with
+ l3-agent and add to config-file path in upstart configuration
+ (LP: #1298676).
+ * d/neutron-vpn-agent.upstart,control: Include l3_agent.ini on upstart
+ config-file path, add dependency on neutron-l3-agent (LP: #1298675).
+
+ -- James Page <james.page@ubuntu.com> Tue, 01 Apr 2014 16:22:54 +0100
+
+neutron (1:2014.1~b3-0ubuntu1) trusty; urgency=medium
+
+ [ Chuck Short ]
+ * New upstream release.
+ * debian/rules: Re-enabled tests.
+ * debian/patches/requirements.patch: Dropped no longer needed.
+ * debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed.
+ * debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed.
+ * debian/neutron-plugin-vmware.install: Install usr/bin/neutron-nsx-manage.
+ * debian/patches/use-concurrency.patch: Set default concurrency to 1.
+
+ [ James Page ]
+ * d/control,neutron-plugin-ibm*: Add plugin and agent packages for IBM
+ SDN-VE.
+ * d/control,neutron-openflow-*: Add agent package for OpenFlow ML2 agent.
+ * d/control,neutron-plugin-bigswitch-agent*: Add agent package for
+ BigSwitch.
+ * d/neutron-plugin-mlnx-agent.{upstart,logrotate}: Correct log path
+ and add logrotate configuration (LP: #1284144).
+
+ [ Corey Bryant ]
+ * Renamed Nicira NVP plugin to VMware NSX (LP: #1273877):
+ - debian/neutron-plugin-*.install: Update path and file for rename
+ - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin
+ - debian/control:
+ + Change neutron-plugin-nicira to transtional package
+ + Add neutron-plugin-vmware package which breaks/replaces
+ neutron-plugin-nicira package.
+
+ -- James Page <james.page@ubuntu.com> Fri, 07 Mar 2014 09:38:32 +0000
+
+neutron (1:2014.1~b2-0ubuntu6) trusty; urgency=medium
+
+ * debian/rules: Temporarily disable testsuite due to upstream breakage.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 06 Feb 2014 08:33:08 -0500
+
+neutron (1:2014.1~b2-0ubuntu5) trusty; urgency=medium
+
+ * debian/patches/disable-udev-tests.patch: Skip more tests
+ because of udev failures.
+ * debian/patches/skip-ipv6-tests.patch: Skip tests that fail
+ on the buildds due to ipv6.
+
+ -- Chuck Short <zulcss@ubuntu.com> Mon, 03 Feb 2014 09:02:45 -0500
+
+neutron (1:2014.1~b2-0ubuntu4) trusty; urgency=medium
+
+ * debian/rules: Really run_tests.sh.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jan 2014 11:44:21 -0500
+
+neutron (1:2014.1~b2-0ubuntu3) trusty; urgency=medium
+
+ * debian/rules: Switch back to run_test.sh since locking
+ issues have been fixed.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jan 2014 10:49:22 -0500
+
+neutron (1:2014.1~b2-0ubuntu2) trusty; urgency=medium
+
+ * debian/patches/skip-lb-test.patch: Skipped lb configuration
+ test.
+
+ -- Chuck Short <zulcss@ubuntu.com> Mon, 27 Jan 2014 12:01:50 -0500
+
+neutron (1:2014.1~b2-0ubuntu1) trusty; urgency=low
+
+ [ James Page ]
+ * Switch to using Modular Layer 2 plugin by default:
+ - d/control,neutron-plugin-ml2.install: Add ML2 plugin package
+ (LP: #1243147).
+ - d/p/fix-quantum-configuration,d/control,d/neutron-server.default:
+ Switch to using the ML2 plugin by default.
+ - d/control,neutron-plugin-openvswitch-agent:
+ Use neutron-plugin-ml2 and configuration for openvswitch-agent.
+ * d/neutron-plugin-mlnx-agent.upstart: Reference correct configuration
+ file (LP: #1257732).
+ * Add neutron-ovs-cleanup upstart configuration for OVS plugin
+ (LP: #1249708):
+ - d/rules: Install new configuration in neutron-plugin-openvswitch-agent
+ package, don't restart on install/upgrade (only needed for reboots).
+ - d/neutron-plugin-openvswitch-agent.upstart: Ensure startup happens
+ after neutron-ovs-cleanup.
+ - d/neutron-{l3|dhcp}-agent.upstart: If neutron-ovs-cleanup job is
+ installed, wait for it to reach running state prior to starting
+ agents.
+ * d/control: Add versioned BD/Depends on python-psutil >= 0.6.1.
+ * d/p/requirements.patch: Drop upper version boundary for psutil for
+ compatibility with Trusty.
+ * d/p/requirements.patch: Lift upper boundary for WebOb to < 1.4.
+ * d/p/disable-failing-metaplugin-tests.patch: Disable metaplugin tests that
+ are currently failing.
+ * d/p/disable-ml2-notification-tests.patch: Dropped, tests now pass.
+ * d/rules: Fail package build on unit test failures.
+ * d/p/disable-failing-cisco-test.patch: Disable failing Cisco mechanism test.
+ * d/control,d/p/remove-jsonrpclib.patch: Add BD on python-jsonrpclib and drop
+ patch that excludes it from requirements.txt.
+
+ [ Chuck Short ]
+ * New upstream release.
+ * debian/rules: Run testr directly
+ * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3
+ compat.
+ * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config.
+
+ -- Chuck Short <zulcss@ubuntu.com> Fri, 24 Jan 2014 09:17:12 -0500
+
+neutron (1:2014.1~b1-0ubuntu1) trusty; urgency=low
+
+ [ Chuck Short ]
+ * New upstream release.
+ * debian/control: open icehouse release.
+
+ [ James Page ]
+ * debian/patches: Refresh patches against upstream master.
+ * debian/control: Drop quantum-* transitional packages, no longer needed.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 11:40:39 -0500
+
+neutron (1:2013.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream release (LP: #1236462).
- -- Chuck Short <zulcss@ubuntu.com> Wed, 16 Oct 2013 16:33:52 -0400
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 10:52:39 -0400
neutron (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
Build-Depends-Indep:
alembic (>= 0.4.1),
+ pep8,
python-amqplib (>= 0.6.1),
python-anyjson (>= 0.3.3),
python-babel,
python-cliff (>= 1.4),
python-configobj,
python-coverage,
- python-d2to1,
+ python-hacking,
python-eventlet (>= 0.13.0),
python-fixtures (>= 0.3.12),
python-greenlet (>= 0.3.2),
- python-httplib2,
- python-iso8601,
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
python-jinja2,
- python-keystoneclient (>= 1:0.2.0),
+ python-jsonrpclib,
+ python-keystonemiddleware (>= 1.0.0),
+ python-keystoneclient (>= 1:0.10.0),
python-kombu (>= 2.5.12),
- python-lxml,
+ python-lxml (>= 2.3),
python-mock (>= 1.0b1),
python-mox,
python-netaddr,
- python-neutronclient (>= 1:2.2.3),
- python-novaclient (>= 2.12.0),
- python-oslo.config (>= 1:1.2.0a3),
+ python-neutronclient (>= 1:2.3.6),
+ python-novaclient (>= 2.17.0),
+ python-oslo.config (>= 1.4.0a3),
+ python-oslo.messaging (>= 1.4.0a3),
+ python-oslo.db,
python-paste,
python-pastedeploy,
- python-pbr (>= 0.5.21),
+ python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
+ python-psutil (>= 0.6.1),
python-pyudev,
python-requests (>= 1.1),
python-routes,
python-setuptools,
python-simplejson,
- python-six,
- python-sqlalchemy,
+ python-six (>= 1.7.0),
+ python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99),
python-stevedore (>= 0.10),
python-testtools (>= 0.9.32),
python-webob,
testrepository ( >= 0.0.17)
XS-Python-Version: >= 2.6
Standards-Version: 3.9.4
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/havana/files
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/havana
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/juno/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/juno
XS-Testsuite: autopkgtest
Package: neutron-server
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
-Recommends: neutron-plugin-openvswitch
+Breaks: quantum-server (<< 1:2013.2~b2-0ubuntu1~)
+Replaces: quantum-server (<< 1:2013.2~b2-0ubuntu1~)
+Recommends: neutron-plugin-ml2
Description: Neutron is a virtual network service for Openstack - server
Neutron is a virtual network service for Openstack, and a part of
Netstack. Just like OpenStack Nova provides an API to dynamically
python-neutron (= ${source:Version}),
${misc:Depends},
${python:Depends}
-Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Breaks:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
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
.
This package provides the BigSwitch plugin.
+Package: neutron-plugin-bigswitch-agent
+Architecture: all
+Depends:
+ neutron-plugin-bigswitch (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs: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-hyperv
Architecture: all
Provides: neutron-plugin
.
This package provides the Metaplugin plugin.
-Package: neutron-plugin-nicira
+Package: neutron-plugin-vmware
Architecture: all
Provides: neutron-plugin
Depends:
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
-Description: Neutron is a virtual network service for Openstack - Nicira plugin
+Breaks: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ )
+Replaces: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ )
+Description: Neutron is a virtual network service for Openstack - VMware 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
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package provides the Nicira NVP plugin
+ This package provides the VMware NSX plugin
+
+Package: neutron-plugin-nicira
+Depends: neutron-plugin-vmware, ${misc:Depends}
+Architecture: all
+Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: neutron-l3-agent
Architecture: all
Architecture: all
Section: python
Depends:
- alembic (>= 0.6.0),
+ alembic (>= 0.6.4),
python-amqplib (>= 0.6.1),
python-anyjson (>= 0.3.3),
+ python-argparse,
python-babel,
python-eventlet (>= 0.13.0),
python-greenlet (>= 0.3.12),
- python-httplib2,
- python-iso8601,
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
python-jinja2,
- python-keystoneclient (>= 1:0.3.0),
+ python-keystonemiddleware (>= 1.0.0),
+ python-keystoneclient (>= 1:0.10.0),
python-kombu (>= 2.5.12),
- python-netaddr,
- python-neutronclient (>= 1:2.2.3),
- python-oslo.config (>= 1:1.2.0a3),
+ python-netaddr (>= 0.7.6 ),
+ python-neutronclient (>= 1:2.3.6),
+ python-novaclient (>= 2.17.0),
+ python-oslo.config (>= 1:1.4.0),
python-paste,
- python-pastedeploy,
+ python-pastedeploy(>= 1.5),
+ python-psutil (>= 0.6.1),
python-requests (>= 1.1),
+ python-oslo.rootwrap (>= 1.3.0a1),
python-routes,
- python-six,
- python-sqlalchemy (>= 0.8.2),
- python-stevedore (>= 0.10),
+ python-six (>= 1.7.0),
+ python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99),
+ python-stevedore (>= 0.14),
python-webob,
${misc:Depends},
${python:Depends}
Package: neutron-plugin-openvswitch-agent
Architecture: all
Depends:
- neutron-common (= ${source:Version}),
- neutron-plugin-ml2,
+ neutron-plugin-ml2 (= ${source:Version}),
openvswitch-switch,
${misc:Depends},
${python:Depends},
Architecture: all
Depends:
bridge-utils,
- neutron-common (= ${source:Version}),
- neutron-plugin-linuxbridge,
+ neutron-plugin-linuxbridge (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Package: neutron-plugin-ryu-agent
Architecture: all
Depends:
- neutron-common (= ${source:Version}),
- neutron-plugin-ryu,
+ neutron-plugin-ryu (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
.
This package provides the Midonet plugin.
-Package: neutron-plugin-mlnx-agent
+Package: neutron-plugin-mlnx
Architecture: all
Provides: neutron-plugin
Depends:
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Description: Neutron is a virtual network service for Openstack - mlnx plugin agent
+Breaks: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ )
+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
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package provides the mlnx plugin agent.
+ This package provides the Mellanox plugin.
-Package: neutron-plugin-vpn-agent
+Package: neutron-plugin-mlnx-agent
Architecture: all
Provides: neutron-plugin
Depends:
neutron-common (= ${source:Version}),
+ neutron-plugin-mlnx,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Description: Neutron is a virtual network service for Openstack - vpn plugin
+Description: Neutron is a virtual network service for Openstack - Mellanox 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
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package provides the vpn plugin.
+ This package provides the Mellanox plugin agent.
-Package: neutron-plugin-metering-agent
+Package: neutron-vpn-agent
Architecture: all
-Provides: neutron-plugin
Depends:
+ iputils-arping,
neutron-common (= ${source:Version}),
+ neutron-metadata-agent (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Description: Neutron is a virtual network service for Openstack - metering plugin
+Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Conflicts: neutron-l3-agent
+Description: Neutron is a virtual network service for Openstack - VPN 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
advanced network capabilities (e.g., QoS, ACLs, network monitoring,
etc.)
.
- This package provides the metering plugin.
+ This package provides the VPN agent, which also provides L3 agent support.
+
+Package: neutron-plugin-vpn-agent
+Architecture: all
+Depends: neutron-vpn-agent, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
-Package: neutron-ovs-cleanup
+Package: neutron-metering-agent
Architecture: all
Depends:
neutron-common (= ${source:Version}),
- neutron-plugin-openvswitch (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Breaks: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ )
-Description: This package provides OVS cleanup upstart script.
-
-Package: quantum-server
-Depends: neutron-server, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-common
-Depends: neutron-common, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-cisco
-Depends: neutron-plugin-cisco, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-nec
-Depends: neutron-plugin-nec, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-nec-agent
-Depends: neutron-plugin-nec-agent, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-bigswitch
-Depends: neutron-plugin-bigswitch, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-hyperv
-Depends: neutron-plugin-hyperv, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-brocade
-Depends: neutron-plugin-brocade, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-plumgrid
-Depends: neutron-plugin-plumgrid, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-metaplugin
-Depends: neutron-plugin-metaplugin, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-nicira
-Depends: neutron-plugin-nicira, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-l3-agent
-Depends: neutron-l3-agent, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-dhcp-agent
-Depends: neutron-dhcp-agent, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-metadata-agent
-Depends: neutron-metadata-agent, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-lbaas-agent
-Depends: neutron-lbaas-agent, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: python-quantum
-Depends: python-neutron, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: quantum-plugin-openvswitch
-Depends: neutron-plugin-openvswitch, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Description: Neutron is a virtual network service for Openstack - metering 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 metering agent.
-Package: quantum-plugin-openvswitch-agent
-Depends: neutron-plugin-openvswitch-agent, ${misc:Depends}
+Package: neutron-plugin-metering-agent
Architecture: all
-Section: oldlibs
+Depends: neutron-metering-agent, ${misc:Depends}
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
-Package: quantum-plugin-linuxbridge
-Depends: neutron-plugin-linuxbridge, ${misc:Depends}
+Package: neutron-plugin-openflow-agent
Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Depends:
+ neutron-plugin-ml2 (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - Openflow 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 Openflow agent.
-Package: quantum-plugin-linuxbridge-agent
-Depends: neutron-plugin-linuxbridge-agent, ${misc:Depends}
+Package: neutron-plugin-ibm
Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - IBM SDN 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 IBM SDN plugin.
-Package: quantum-plugin-ryu
-Depends: neutron-plugin-ryu, ${misc:Depends}
+Package: neutron-plugin-ibm-agent
Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Depends:
+ neutron-plugin-ibm (= ${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 IBM agent.
-Package: quantum-plugin-ryu-agent
-Depends: neutron-plugin-ryu-agent, ${misc:Depends}
+Package: neutron-plugin-oneconvergence
Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs: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: quantum-plugin-midonet
-Depends: neutron-plugin-midonet, ${misc:Depends}
+Package: neutron-plugin-oneconvergence-agent
Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Depends:
+ neutron-plugin-oneconvergence (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs: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.
# vim: set filetype=crontab:
-# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# Periodically cleans Neutron's network namespaces on behalf of the Neutron
# DHCP agent.
30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi
# vim: set filetype=crontab:
-# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# Periodically cleans Neutron's network namespaces on behalf of the Neutron
# L3 agent.
0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi
# vim: set filetype=crontab:
-# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# Periodically cleans Neutron's network namespaces on behalf of the Neutron
# L3 agent.
0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi
var/log/neutron
var/lib/neutron
+var/lib/neutron/lock
etc/neutron
etc/neutron/rootwrap.d
etc/neutron/plugins
+debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
debian/neutron_sudoers etc/sudoers.d
etc/api-paste.ini etc/neutron
+etc/fwaas_driver.ini etc/neutron
+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/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/policy.json etc/neutron
etc/rootwrap.conf etc/neutron
+etc/vpn_agent.ini etc/neutron
usr/bin/neutron-db-manage usr/bin
usr/bin/neutron-debug usr/bin
usr/bin/neutron-netns-cleanup usr/bin
usr/bin/neutron-rootwrap usr/bin
usr/bin/neutron-rootwrap-xen-dom0 usr/bin
usr/bin/neutron-usage-audit usr/bin
+usr/bin/neutron-sanity-check usr/bin
+usr/bin/neutron-sriov-nic-agent usr/bin
pre-start script
mkdir -p /var/run/neutron
chown neutron:root /var/run/neutron
+ # Check to see if openvswitch plugin in use by checking
+ # status of cleanup upstart configuration
+ if status neutron-ovs-cleanup; then
+ start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent
+ fi
end script
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log
-debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
-etc/l3_agent.ini etc/neutron
-etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
usr/bin/neutron-l3-agent usr/bin
pre-start script
mkdir -p /var/run/neutron
chown neutron:root /var/run/neutron
+ # Check to see if openvswitch plugin in use by checking
+ # status of cleanup upstart configuration
+ if status neutron-ovs-cleanup; then
+ start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent
+ fi
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
+ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
+ --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
# vim:set ft=upstart ts=2 et:
-description "Neutron metering agent"
+description "Neutron Metering Agent"
author "Chuck Short <zulcss@ubuntu.com>"
start on runlevel [2345]
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/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
+ /usr/bin/neutron-ovs-cleanup --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
end script
--- /dev/null
+usr/bin/neutron-restproxy-agent /usr/bin
--- /dev/null
+/var/log/neutron/bigswitch-agent.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ notifempty
+}
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron BigSwitch Plugin 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/neutron-restproxy-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/bigswitch/restproxy.ini \
+ --log-file=/var/log/neutron/bigswitch-agent.log
etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco
+usr/bin/neutron-cisco-cfg-agent usr/bin
--- /dev/null
+usr/bin/neutron-ibm-agent usr/bin
--- /dev/null
+/var/log/neutron/ibm-agent.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ notifempty
+}
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron IBM 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/neutron-ibm-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini \
+ --log-file=/var/log/neutron/ibm-agent.log
--- /dev/null
+etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini etc/neutron/plugins/ibm
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-metering-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-metering-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-metering-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-metering-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-metering-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-metering-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
etc/neutron/plugins/ml2/* etc/neutron/plugins/ml2
-
-etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
usr/bin/neutron-mlnx-agent usr/bin
--- /dev/null
+/var/log/neutron/mlnx-agent.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ notifempty
+}
end script
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \
- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx_conf.ini \
- --log-file=/var/log/neutron/mlnx_conf.log
+ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \
+ --log-file=/var/log/neutron/mlnx-agent.log
--- /dev/null
+etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
+++ /dev/null
-etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira
-usr/bin/neutron-check-nvp-config usr/bin
--- /dev/null
+usr/bin/neutron-nvsd-agent /usr/bin
--- /dev/null
+/var/log/neutron/nvsd-agent.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ notifempty
+}
# vim:set ft=upstart ts=2 et:
-description "Neutron vpn Plugin Agent"
+description "One Convergence Plugin Agent"
author "Chuck Short <zulcss@ubuntu.com>"
start on runlevel [2345]
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
- --log-file=/var/log/neutron/vpn_agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nvsd-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/oneconvergence/nvsdplugin.ini --log-file=/var/log/neutron/nvsd-agent.log
+
--- /dev/null
+etc/neutron/plugins/oneconvergence/* etc/neutron/plugins/oneconvergence
--- /dev/null
+usr/bin/neutron-ofagent-agent usr/bin
--- /dev/null
+/var/log/neutron/openflow-agent.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ notifempty
+}
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron OpenFlow Plugin 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/neutron-ofagent-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/ml2/ml2_conf_ofa.ini \
+ --log-file=/var/log/neutron/openflow-agent.log
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron OVS cleanup"
+author "James Page <james.page@ubuntu.com>"
+
+start on started openvswitch-switch
+stop on runlevel [!2345]
+
+pre-start script
+ [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0
+ start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \
+ --log-file /var/log/neutron/ovs-cleanup.log \
+ --config-file /etc/neutron/neutron.conf --verbose
+end script
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/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/ovs-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/vmware/* etc/neutron/plugins/vmware
+usr/bin/neutron-check-nsx-config usr/bin
+usr/bin/neutron-nsx-manage usr/bin
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \
+ 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@"
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
# path to config file corresponding to the core_plugin specified in
# neutron.conf
-NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
+NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugin.ini"
-etc/vpn_agent.ini etc/neutron
usr/bin/neutron-vpn-agent usr/bin
--- /dev/null
+# vim:set ft=upstart ts=2 et:
+description "Neutron VPN 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
+ # Check to see if openvswitch plugin in use by checking
+ # status of cleanup upstart configuration
+ if status neutron-ovs-cleanup; then
+ start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent
+ fi
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
+ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
+ --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
+ --log-file=/var/log/neutron/vpn_agent.log
Defaults:neutron !requiretty
-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
+neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf *
+++ /dev/null
-From 7f1af65475d5c3c1ea5440116ed1f03a186663ff Mon Sep 17 00:00:00 2001
-From: Maru Newby <marun@redhat.com>
-Date: Tue, 10 Dec 2013 16:10:42 +0000
-Subject: [PATCH 1/1] Send DHCP notifications regardless of agent status
-
-The Neutron service, when under load, may not be able to process
-agent heartbeats in a timely fashion. This can result in
-agents being erroneously considered inactive. Previously, DHCP
-notifications for which active agents could not be found were
-silently dropped. This change ensures that notifications for
-a given network are sent to agents even if those agents do not
-appear to be active.
-
-Additionally, if no enabled dhcp agents can be found for a given
-network, an error will be logged. Raising an exception might be
-preferable, but has such a large testing impact that it will be
-submitted as a separate patch if deemed necessary.
-
-Closes-bug: #1192381
-(cherry picked from commit 522f9f94681de5903422cfde11b93f5c0e71e532)
-
-Change-Id: Id3e639d9cf3d16708fd66a4baebd3fbeeed3dde8
----
- .../api/rpc/agentnotifiers/dhcp_rpc_agent_api.py | 35 ++++++++--
- neutron/db/agents_db.py | 4 ++
- neutron/tests/unit/api/__init__.py | 0
- neutron/tests/unit/api/rpc/__init__.py | 0
- .../tests/unit/api/rpc/agentnotifiers/__init__.py | 0
- .../rpc/agentnotifiers/test_dhcp_rpc_agent_api.py | 76 ++++++++++++++++++++++
- 6 files changed, 108 insertions(+), 7 deletions(-)
- create mode 100644 neutron/tests/unit/api/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/agentnotifiers/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-
-diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-index 1086a9e..4ed724d 100644
---- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-+++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-@@ -43,12 +43,11 @@ class DhcpAgentNotifyAPI(proxy.RpcProxy):
- super(DhcpAgentNotifyAPI, self).__init__(
- topic=topic, default_version=self.BASE_RPC_API_VERSION)
-
-- def _get_dhcp_agents(self, context, network_id):
-+ def _get_enabled_dhcp_agents(self, context, network_id):
-+ """Return enabled dhcp agents associated with the given network."""
- plugin = manager.NeutronManager.get_plugin()
-- dhcp_agents = plugin.get_dhcp_agents_hosting_networks(
-- context, [network_id], active=True)
-- return [(dhcp_agent.host, dhcp_agent.topic) for
-- dhcp_agent in dhcp_agents]
-+ agents = plugin.get_dhcp_agents_hosting_networks(context, [network_id])
-+ return [x for x in agents if x.admin_state_up]
-
- def _notification_host(self, context, method, payload, host):
- """Notify the agent on host."""
-@@ -76,11 +75,33 @@ class DhcpAgentNotifyAPI(proxy.RpcProxy):
- context, 'network_create_end',
- {'network': {'id': network_id}},
- agent['host'])
-- for (host, topic) in self._get_dhcp_agents(context, network_id):
-+ agents = self._get_enabled_dhcp_agents(context, network_id)
-+ if not agents:
-+ LOG.error(_("No DHCP agents are associated with network "
-+ "'%(net_id)s'. Unable to send notification "
-+ "for '%(method)s' with payload: %(payload)s"),
-+ {
-+ 'net_id': network_id,
-+ 'method': method,
-+ 'payload': payload,
-+ })
-+ return
-+ active_agents = [x for x in agents if x.is_active]
-+ if active_agents != agents:
-+ LOG.warning(_("Only %(active)d of %(total)d DHCP agents "
-+ "associated with network '%(net_id)s' are "
-+ "marked as active, so notifications may "
-+ "be sent to inactive agents."),
-+ {
-+ 'active': len(active_agents),
-+ 'total': len(agents),
-+ 'net_id': network_id,
-+ })
-+ for agent in agents:
- self.cast(
- context, self.make_msg(method,
- payload=payload),
-- topic='%s.%s' % (topic, host))
-+ topic='%s.%s' % (agent.topic, agent.host))
- else:
- # besides the non-agentscheduler plugin,
- # There is no way to query who is hosting the network
-diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py
-index e095a4c..fdcc6d3 100644
---- a/neutron/db/agents_db.py
-+++ b/neutron/db/agents_db.py
-@@ -60,6 +60,10 @@ class Agent(model_base.BASEV2, models_v2.HasId):
- # configurations: a json dict string, I think 4095 is enough
- configurations = sa.Column(sa.String(4095), nullable=False)
-
-+ @property
-+ def is_active(self):
-+ return not AgentDbMixin.is_agent_down(self.heartbeat_timestamp)
-+
-
- class AgentDbMixin(ext_agent.AgentPluginBase):
- """Mixin class to add agent extension to db_plugin_base_v2."""
-diff --git a/neutron/tests/unit/api/__init__.py b/neutron/tests/unit/api/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/__init__.py b/neutron/tests/unit/api/rpc/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/__init__.py b/neutron/tests/unit/api/rpc/agentnotifiers/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-new file mode 100644
-index 0000000..b175d34
---- /dev/null
-+++ b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-@@ -0,0 +1,76 @@
-+# Copyright (c) 2013 Red Hat, Inc.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+# implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+import contextlib
-+
-+import mock
-+
-+from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
-+from neutron.common import utils
-+from neutron import manager
-+from neutron.tests import base
-+
-+
-+class TestDhcpAgentNotifyAPI(base.BaseTestCase):
-+
-+ def setUp(self):
-+ super(TestDhcpAgentNotifyAPI, self).setUp()
-+ self.notify = dhcp_rpc_agent_api.DhcpAgentNotifyAPI()
-+
-+ def test_get_enabled_dhcp_agents_filters_disabled_agents(self):
-+ disabled_agent = mock.Mock()
-+ disabled_agent.admin_state_up = False
-+ enabled_agent = mock.Mock()
-+ with mock.patch.object(manager.NeutronManager,
-+ 'get_plugin') as mock_get_plugin:
-+ mock_get_plugin.return_value = mock_plugin = mock.Mock()
-+ with mock.patch.object(
-+ mock_plugin, 'get_dhcp_agents_hosting_networks'
-+ ) as mock_get_agents:
-+ mock_get_agents.return_value = [disabled_agent, enabled_agent]
-+ result = self.notify._get_enabled_dhcp_agents('ctx', 'net_id')
-+ self.assertEqual(result, [enabled_agent])
-+
-+ def _test_notification(self, agents):
-+ with contextlib.nested(
-+ mock.patch.object(manager.NeutronManager, 'get_plugin'),
-+ mock.patch.object(utils, 'is_extension_supported'),
-+ mock.patch.object(self.notify, '_get_enabled_dhcp_agents')
-+ ) as (m1, m2, mock_get_agents):
-+ mock_get_agents.return_value = agents
-+ self.notify._notification(mock.Mock(), 'foo', {}, 'net_id')
-+
-+ def test_notification_sends_cast_for_enabled_agent(self):
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ self._test_notification([mock.Mock()])
-+ self.assertEqual(mock_cast.call_count, 1)
-+
-+ def test_notification_logs_error_for_no_enabled_agents(self):
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ with mock.patch.object(dhcp_rpc_agent_api.LOG,
-+ 'error') as mock_log:
-+ self._test_notification([])
-+ self.assertEqual(mock_cast.call_count, 0)
-+ self.assertEqual(mock_log.call_count, 1)
-+
-+ def test_notification_logs_warning_for_inactive_agents(self):
-+ agent = mock.Mock()
-+ agent.is_active = False
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ with mock.patch.object(dhcp_rpc_agent_api.LOG,
-+ 'warning') as mock_log:
-+ self._test_notification([agent])
-+ self.assertEqual(mock_cast.call_count, 1)
-+ self.assertEqual(mock_log.call_count, 1)
---
-1.8.3.1
-
+++ /dev/null
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -17,7 +17,7 @@ Jinja2
- kombu>=2.4.8
- netaddr
- python-neutronclient>=2.3.0,<3
--SQLAlchemy>=0.7.8,<=0.7.99
-+SQLAlchemy>=0.7.8,<=0.8.99
- WebOb>=1.2.3,<1.3
- python-keystoneclient>=0.3.2
- alembic>=0.4.1
--- /dev/null
+Description: Skip failing cisco test
+ ======================================================================
+ FAIL: neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin
+ neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin
+ ----------------------------------------------------------------------
+ _StringException
+
+ ----------------------------------------------------------------------
+Author: James Page <james.page@ubuntu.com>
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262195
+
+--- a/neutron/tests/unit/ml2/drivers/test_cisco_mech.py
++++ b/neutron/tests/unit/ml2/drivers/test_cisco_mech.py
+@@ -147,8 +147,8 @@ class CiscoML2MechanismTestCase(test_db_
+
+ class TestCiscoBasicGet(CiscoML2MechanismTestCase,
+ test_db_plugin.TestBasicGet):
+-
+- pass
++ def test_single_get_admin(self):
++ pass
+
+
+ class TestCiscoV2HTTPResponse(CiscoML2MechanismTestCase,
+++ /dev/null
---- a/neutron/tests/unit/ml2/test_agent_scheduler.py
-+++ b/neutron/tests/unit/ml2/test_agent_scheduler.py
-@@ -19,18 +19,19 @@ from neutron.tests.unit.openvswitch impo
-
- class Ml2AgentSchedulerTestCase(
- test_agent_scheduler.OvsAgentSchedulerTestCase):
-- plugin_str = test_ml2_plugin.PLUGIN_NAME
-+ pass
- l3_plugin = ('neutron.services.l3_router.'
- 'l3_router_plugin.L3RouterPlugin')
-
-
- class Ml2L3AgentNotifierTestCase(
- test_agent_scheduler.OvsL3AgentNotifierTestCase):
-- plugin_str = test_ml2_plugin.PLUGIN_NAME
-+ pass
- l3_plugin = ('neutron.services.l3_router.'
- 'l3_router_plugin.L3RouterPlugin')
-
-
- class Ml2DhcpAgentNotifierTestCase(
- test_agent_scheduler.OvsDhcpAgentNotifierTestCase):
-+ pass
- plugin_str = test_ml2_plugin.PLUGIN_NAME
+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
-@@ -45,6 +45,7 @@ class FakeIpDevice(object):
+@@ -48,6 +48,7 @@ class FakeIpDevice(object):
class TestLinuxBridge(base.BaseTestCase):
def setUp(self):
+ self.skipTest("udev not consistently available in Ubuntu buildds")
super(TestLinuxBridge, self).setUp()
- self.addCleanup(cfg.CONF.reset)
interface_mappings = {'physnet1': 'eth1'}
-@@ -160,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+ root_helper = cfg.CONF.AGENT.root_helper
+@@ -96,6 +97,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
+ 'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
+
+ def setUp(self):
++ self.skipTest("udev not consistently available in Ubuntu buildds")
+ super(TestLinuxBridgeAgent, self).setUp()
+ # disable setting up periodic state reporting
+ cfg.CONF.set_override('report_interval', 0, 'AGENT')
+@@ -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
-@@ -639,6 +641,7 @@ class TestLinuxBridgeManager(base.BaseTe
-
- class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
- def setUp(self):
-+ self.skipTest("udev not consistently available in Ubuntu buildds")
- cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN')
- self.addCleanup(cfg.CONF.reset)
- super(TestLinuxBridgeRpcCallbacks, self).setUp()
+
--- /dev/null
+diff --git a/etc/neutron.conf b/etc/neutron.conf
+index 31977a8..62a0e14 100644
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
+@@ -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.
+ #
+-# core_plugin =
++core_plugin = ml2
+ # Example: core_plugin = ml2
+
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -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
+-# 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
+@@ -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.)
+-# 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
+--
+2.0.0
+
--- 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
-@@ -45,7 +45,7 @@ lock_path = $state_path/lock
- # api_extensions_path =
-
- # Neutron plugin provider module
+@@ -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
-
- # Advanced service modules
- # service_plugins =
-@@ -295,7 +295,7 @@ notification_driver = neutron.openstack.
- # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
+ # 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
+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
-@@ -319,7 +319,7 @@ signing_dir = $state_path/keystone-signi
+@@ -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
-
- # The SQLAlchemy connection string used to connect to the slave database
- # slave_connection =
+ # 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
+++ /dev/null
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -12,7 +12,6 @@ greenlet>=0.3.2
- httplib2
- requests>=1.1
- iso8601>=0.1.8
--jsonrpclib
- Jinja2
- kombu>=2.4.8
- netaddr
-fix-quantum-configuration.patch
+fix-neutron-configuration.patch
disable-udev-tests.patch
-bump-sqlalchemy-version.patch
-disable-ml2-notification-tests.patch
-remove-jsonrpclib.patch
quantum_server quantum-server
quantum_common quantum-common
setuptools-git
-jsonrpclib
dh $@ --with python2
override_dh_install:
- dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum
+ dh_install --fail-missing -X/usr/etc
+
+override_dh_installinit:
+ dh_installinit
+ dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
override_dh_auto_clean:
dh_clean
override_dh_auto_test:
# Unpatch quantum configuration to fixup tests which conflict
# with a core_plugin being set.
- patch -p1 -R < debian/patches/fix-quantum-configuration.patch
+ patch -p1 -R < debian/patches/fix-neutron-configuration.patch
# Set a reasonable level of concurrency
- ./run_tests.sh -N -P --concurrency=4 || true
+ ./run_tests.sh -N -P --concurrency=4
# Patch configuration file after testing
- patch -p1 < debian/patches/fix-quantum-configuration.patch
+ patch -p1 < debian/patches/fix-neutron-configuration.patch
endif
Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin
- hyperv-plugin brocade-plugin plumgrid-plugin nicira-plugin openvswitch-plugin
+ hyperv-plugin brocade-plugin plumgrid-plugin vmware-plugin openvswitch-plugin
linuxbridge-plugin ryu-plugin midonet-plugin
Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent,
neutron-lbaas-agent, python-neutron, rabbitmq-server
-Restrictions: needs-root
+Restrictions: needs-root allow-stderr
# Testing neutron-daemon
#-----------------------
set -e
-DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent')
+DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent')
for daemon in "${DAEMONS[@]}"; do
if pidof -x $daemon > /dev/null; then
echo "OK"
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
#!/bin/bash
#----------------------
-# Testing nicira-plugin
+# Testing vmware-plugin
#----------------------
set -e
-apt-get -y install neutron-plugin-nicira
+apt-get -y install neutron-plugin-vmware
# update plugin path
-sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nicira\/nvp\.ini\"/g' /etc/default/neutron-server
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/vmware\/nsx\.ini\"/g' /etc/default/neutron-server
sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf
service neutron-server restart > /dev/null 2>&1
if pidof -x neutron-server > /dev/null; then
- apt-get -y remove --purge neutron-plugin-nicira
+ apt-get -y remove --purge neutron-plugin-vmware
echo "OK"
else
- echo "ERROR: NICIRA PLUGIN IS NOT RUNNING"
- apt-get -y remove --purge neutron-plugin-nicira
+ echo "ERROR: VMWARE PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-vmware
exit 1
fi
--- /dev/null
+From 335733277b8b3c0a47fd4e9a914a6f15c7d24249 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Mon, 24 Mar 2014 14:50:23 +0000
+Subject: [PATCH] remove runtime dependency on pbr
+
+---
+ neutron/version.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/neutron/version.py b/neutron/version.py
+index 2dbf54d..3c9d912 100644
+--- a/neutron/version.py
++++ b/neutron/version.py
+@@ -12,6 +12,15 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import pbr.version
++class VersionInfo(object):
++ release = "RPMRELEASE"
++ version = "RPMVERSION"
+
+-version_info = pbr.version.VersionInfo('neutron')
++ def version_string(self):
++ return self.version
++
++ def release_string(self):
++ return self.release
++
++
++version_info = VersionInfo()
+++ /dev/null
-From 9e51bf76149105791742f84a4a639f9a0f661aad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 13 Apr 2012 17:24:40 +0100
-Subject: [PATCH] use parallel installed versions in RHEL6
-
-of webob sqlalchemy python-routes paste-deploy python-jinja2-26
-
-Change-Id: I290f56eae61c87893639a9e5d29f7fff760452cf
----
- neutron/__init__.py | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/neutron/__init__.py b/neutron/__init__.py
-index b2c81bd..fef4d32 100644
---- a/neutron/__init__.py
-+++ b/neutron/__init__.py
-@@ -15,6 +15,37 @@
- # License for the specific language governing permissions and limitations
- # under the License.
-
-+import sys
-+import pkg_resources
-+
-+# If there is a conflicting non egg module,
-+# i.e. an older standard system module installed,
-+# then replace it with this requirement
-+def replace_dist(requirement):
-+ try:
-+ return pkg_resources.require(requirement)
-+ except pkg_resources.VersionConflict:
-+ e = sys.exc_info()[1]
-+ dist=e.args[0]
-+ req=e.args[1]
-+ if dist.key == req.key and not dist.location.endswith('.egg'):
-+ del pkg_resources.working_set.by_key[dist.key]
-+ # We assume there is no need to adjust sys.path
-+ # and the associated pkg_resources.working_set.entries
-+ return pkg_resources.require(requirement)
-+
-+replace_dist("WebOb >= 1.2")
-+replace_dist("SQLAlchemy >= 0.6.3")
-+replace_dist("Routes >= 1.12.3")
-+replace_dist("Jinja2 >= 2.6")
-+
-+replace_dist("PasteDeploy >= 1.5.0")
-+# This hack is needed because replace_dist() results in
-+# the standard paste module path being at the start of __path__.
-+# TODO: See can we get pkg_resources to do the right thing directly
-+import paste
-+paste.__path__.insert(0, paste.__path__.pop(-1))
-+
- import gettext
-
-
+++ /dev/null
-From 7f1af65475d5c3c1ea5440116ed1f03a186663ff Mon Sep 17 00:00:00 2001
-From: Maru Newby <marun@redhat.com>
-Date: Tue, 10 Dec 2013 16:10:42 +0000
-Subject: [PATCH 1/1] Send DHCP notifications regardless of agent status
-
-The Neutron service, when under load, may not be able to process
-agent heartbeats in a timely fashion. This can result in
-agents being erroneously considered inactive. Previously, DHCP
-notifications for which active agents could not be found were
-silently dropped. This change ensures that notifications for
-a given network are sent to agents even if those agents do not
-appear to be active.
-
-Additionally, if no enabled dhcp agents can be found for a given
-network, an error will be logged. Raising an exception might be
-preferable, but has such a large testing impact that it will be
-submitted as a separate patch if deemed necessary.
-
-Closes-bug: #1192381
-(cherry picked from commit 522f9f94681de5903422cfde11b93f5c0e71e532)
-
-Change-Id: Id3e639d9cf3d16708fd66a4baebd3fbeeed3dde8
----
- .../api/rpc/agentnotifiers/dhcp_rpc_agent_api.py | 35 ++++++++--
- neutron/db/agents_db.py | 4 ++
- neutron/tests/unit/api/__init__.py | 0
- neutron/tests/unit/api/rpc/__init__.py | 0
- .../tests/unit/api/rpc/agentnotifiers/__init__.py | 0
- .../rpc/agentnotifiers/test_dhcp_rpc_agent_api.py | 76 ++++++++++++++++++++++
- 6 files changed, 108 insertions(+), 7 deletions(-)
- create mode 100644 neutron/tests/unit/api/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/agentnotifiers/__init__.py
- create mode 100644 neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-
-diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-index 1086a9e..4ed724d 100644
---- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-+++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
-@@ -43,12 +43,11 @@ class DhcpAgentNotifyAPI(proxy.RpcProxy):
- super(DhcpAgentNotifyAPI, self).__init__(
- topic=topic, default_version=self.BASE_RPC_API_VERSION)
-
-- def _get_dhcp_agents(self, context, network_id):
-+ def _get_enabled_dhcp_agents(self, context, network_id):
-+ """Return enabled dhcp agents associated with the given network."""
- plugin = manager.NeutronManager.get_plugin()
-- dhcp_agents = plugin.get_dhcp_agents_hosting_networks(
-- context, [network_id], active=True)
-- return [(dhcp_agent.host, dhcp_agent.topic) for
-- dhcp_agent in dhcp_agents]
-+ agents = plugin.get_dhcp_agents_hosting_networks(context, [network_id])
-+ return [x for x in agents if x.admin_state_up]
-
- def _notification_host(self, context, method, payload, host):
- """Notify the agent on host."""
-@@ -76,11 +75,33 @@ class DhcpAgentNotifyAPI(proxy.RpcProxy):
- context, 'network_create_end',
- {'network': {'id': network_id}},
- agent['host'])
-- for (host, topic) in self._get_dhcp_agents(context, network_id):
-+ agents = self._get_enabled_dhcp_agents(context, network_id)
-+ if not agents:
-+ LOG.error(_("No DHCP agents are associated with network "
-+ "'%(net_id)s'. Unable to send notification "
-+ "for '%(method)s' with payload: %(payload)s"),
-+ {
-+ 'net_id': network_id,
-+ 'method': method,
-+ 'payload': payload,
-+ })
-+ return
-+ active_agents = [x for x in agents if x.is_active]
-+ if active_agents != agents:
-+ LOG.warning(_("Only %(active)d of %(total)d DHCP agents "
-+ "associated with network '%(net_id)s' are "
-+ "marked as active, so notifications may "
-+ "be sent to inactive agents."),
-+ {
-+ 'active': len(active_agents),
-+ 'total': len(agents),
-+ 'net_id': network_id,
-+ })
-+ for agent in agents:
- self.cast(
- context, self.make_msg(method,
- payload=payload),
-- topic='%s.%s' % (topic, host))
-+ topic='%s.%s' % (agent.topic, agent.host))
- else:
- # besides the non-agentscheduler plugin,
- # There is no way to query who is hosting the network
-diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py
-index e095a4c..fdcc6d3 100644
---- a/neutron/db/agents_db.py
-+++ b/neutron/db/agents_db.py
-@@ -60,6 +60,10 @@ class Agent(model_base.BASEV2, models_v2.HasId):
- # configurations: a json dict string, I think 4095 is enough
- configurations = sa.Column(sa.String(4095), nullable=False)
-
-+ @property
-+ def is_active(self):
-+ return not AgentDbMixin.is_agent_down(self.heartbeat_timestamp)
-+
-
- class AgentDbMixin(ext_agent.AgentPluginBase):
- """Mixin class to add agent extension to db_plugin_base_v2."""
-diff --git a/neutron/tests/unit/api/__init__.py b/neutron/tests/unit/api/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/__init__.py b/neutron/tests/unit/api/rpc/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/__init__.py b/neutron/tests/unit/api/rpc/agentnotifiers/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-new file mode 100644
-index 0000000..b175d34
---- /dev/null
-+++ b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py
-@@ -0,0 +1,76 @@
-+# Copyright (c) 2013 Red Hat, Inc.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+# implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+import contextlib
-+
-+import mock
-+
-+from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
-+from neutron.common import utils
-+from neutron import manager
-+from neutron.tests import base
-+
-+
-+class TestDhcpAgentNotifyAPI(base.BaseTestCase):
-+
-+ def setUp(self):
-+ super(TestDhcpAgentNotifyAPI, self).setUp()
-+ self.notify = dhcp_rpc_agent_api.DhcpAgentNotifyAPI()
-+
-+ def test_get_enabled_dhcp_agents_filters_disabled_agents(self):
-+ disabled_agent = mock.Mock()
-+ disabled_agent.admin_state_up = False
-+ enabled_agent = mock.Mock()
-+ with mock.patch.object(manager.NeutronManager,
-+ 'get_plugin') as mock_get_plugin:
-+ mock_get_plugin.return_value = mock_plugin = mock.Mock()
-+ with mock.patch.object(
-+ mock_plugin, 'get_dhcp_agents_hosting_networks'
-+ ) as mock_get_agents:
-+ mock_get_agents.return_value = [disabled_agent, enabled_agent]
-+ result = self.notify._get_enabled_dhcp_agents('ctx', 'net_id')
-+ self.assertEqual(result, [enabled_agent])
-+
-+ def _test_notification(self, agents):
-+ with contextlib.nested(
-+ mock.patch.object(manager.NeutronManager, 'get_plugin'),
-+ mock.patch.object(utils, 'is_extension_supported'),
-+ mock.patch.object(self.notify, '_get_enabled_dhcp_agents')
-+ ) as (m1, m2, mock_get_agents):
-+ mock_get_agents.return_value = agents
-+ self.notify._notification(mock.Mock(), 'foo', {}, 'net_id')
-+
-+ def test_notification_sends_cast_for_enabled_agent(self):
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ self._test_notification([mock.Mock()])
-+ self.assertEqual(mock_cast.call_count, 1)
-+
-+ def test_notification_logs_error_for_no_enabled_agents(self):
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ with mock.patch.object(dhcp_rpc_agent_api.LOG,
-+ 'error') as mock_log:
-+ self._test_notification([])
-+ self.assertEqual(mock_cast.call_count, 0)
-+ self.assertEqual(mock_log.call_count, 1)
-+
-+ def test_notification_logs_warning_for_inactive_agents(self):
-+ agent = mock.Mock()
-+ agent.is_active = False
-+ with mock.patch.object(self.notify, 'cast') as mock_cast:
-+ with mock.patch.object(dhcp_rpc_agent_api.LOG,
-+ 'warning') as mock_log:
-+ self._test_notification([agent])
-+ self.assertEqual(mock_cast.call_count, 1)
-+ self.assertEqual(mock_log.call_count, 1)
---
-1.8.3.1
-
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/dhcp_agent.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/dhcp-agent.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
[ -f $config ] || exit 6
done
echo -n $"Starting $prog: "
- daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+ daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (C) 2012, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-# The script supports the plugins below
-declare -a SUPPORTED_PLUGINS=(linuxbridge openvswitch)
-
-#
-# Print --help output and exit.
-#
-usage() {
-
-cat << EOF
-The helper script will install the necessary support for the DHCP agent.
-
-Usage: neutron-dhcp-setup [options]
-Options:
- --help | -h
- Print usage information.
- --plugin | -p
- The neutron plugin. Supported plugins:-
- ${SUPPORTED_PLUGINS[*]}
- --qhost | -q
- The Neutron hostname (assumes that this is also the QPID host).
-EOF
-
- exit 0
-}
-
-is_valid_plugin() {
- local i=
- for i in "${SUPPORTED_PLUGINS[@]}"; do
- if [ "$i" == "$1" ]; then
- return 0
- fi
- done
- return 1
-}
-
-DHCP_CONF=/etc/neutron/dhcp_agent.ini
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -h|--help)
- usage
- ;;
- -p|--plugin)
- shift
- NEUTRON_PLUGIN=${1}
- ;;
- -q|--qhost)
- shift
- Q_HOST=${1}
- ;;
- *)
- # ignore
- shift
- ;;
- esac
- shift
-done
-
-# if the plugin is not defined
-if [ -z ${NEUTRON_PLUGIN} ] ; then
- echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
- echo "Choice:"
- read NEUTRON_PLUGIN
-fi
-
-# check that the plugin is valid
-is_valid_plugin ${NEUTRON_PLUGIN}
-if [ $? -ne 0 ]; then
- echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
- echo " ${SUPPORTED_PLUGINS[*]}"
- exit 0
-fi
-
-echo "Neutron plugin: ${NEUTRON_PLUGIN}"
-
-if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Neutron hostname:"
- read Q_HOST
-fi
-
-Q_PORT=9696
-Q_CONF=/etc/neutron/neutron.conf
-# QPID
-openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
-openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-
-case "${NEUTRON_PLUGIN}" in
-"linuxbridge")
- LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.BridgeInterfaceDriver
-;;
-
-"openvswitch")
- if ! rpm -q openvswitch > /dev/null
- then
- echo "Please install openvswitch"
- exit 0
- fi
- LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.OVSInterfaceDriver
-;;
-
-esac
-
-# Keystone specific
-OS_USERNAME=${OS_USERNAME:-neutron}
-OS_PASSWORD=${OS_PASSWORD:-servicepass}
-OS_AUTH_URL=${OS_AUTH_URL:-http://localhost:35357/v2.0/}
-OS_TENANT_NAME=${OS_TENANT_NAME:-service}
-
-# Update Keystone
-openstack-config --set ${DHCP_CONF} DEFAULT auth_url ${OS_AUTH_URL}
-openstack-config --set ${DHCP_CONF} DEFAULT admin_username ${OS_USERNAME}
-openstack-config --set ${DHCP_CONF} DEFAULT admin_password ${OS_PASSWORD}
-openstack-config --set ${DHCP_CONF} DEFAULT admin_tenant_name ${OS_TENANT_NAME}
-
-# Update interface driver
-openstack-config --set ${DHCP_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
-
-echo "Configuration updates complete!"
lock_path = $state_path/lock
auth_strategy = noauth
notification_driver = neutron.openstack.common.notifier.rpc_notifier
-rpc_backend = neutron.openstack.common.rpc.impl_qpid
allow_overlapping_ips = True
+use_stderr = False
+api_paste_config = /usr/share/neutron/api-paste.ini
[quotas]
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
-signing_dir = $state_path/keystone-signing
[database]
max_pool_size = 10
[service_providers]
service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/l3_agent.ini" \
+ "/etc/$proj/fwaas_driver.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/l3-agent.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
[ -f $config ] || exit 6
done
echo -n $"Starting $prog: "
- daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+ daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
respawn
-exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" --config-file /etc/neutron/fwaas_driver.ini neutron
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (C) 2012, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-# The script supports the plugins below
-declare -a SUPPORTED_PLUGINS=(linuxbridge openvswitch)
-
-#
-# Print --help output and exit.
-#
-usage() {
-
-cat << EOF
-The helper script will install the necessary support for the L3 agent.
-
-Usage: neutron-l3-setup [options]
-Options:
- --help | -h
- Print usage information.
- --plugin | -p
- The neutron plugin. Supported plugins:-
- ${SUPPORTED_PLUGINS[*]}
- --qhost | -q
- The Neutron hostname (assumes that this is also the QPID host).
-EOF
-
- exit 0
-}
-
-is_valid_plugin() {
- local i=
- for i in "${SUPPORTED_PLUGINS[@]}"; do
- if [ "$i" == "$1" ]; then
- return 0
- fi
- done
- return 1
-}
-
-L3_CONF=/etc/neutron/l3_agent.ini
-L3_META_CONF=/etc/neutron/metadata_agent.ini
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -h|--help)
- usage
- ;;
- -p|--plugin)
- shift
- NEUTRON_PLUGIN=${1}
- ;;
- -q|--qhost)
- shift
- Q_HOST=${1}
- ;;
- *)
- # ignore
- shift
- ;;
- esac
- shift
-done
-
-# if the plugin is not defined
-if [ -z ${NEUTRON_PLUGIN} ] ; then
- echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
- echo "Choice:"
- read NEUTRON_PLUGIN
-fi
-
-# check that the plugin is valid
-is_valid_plugin ${NEUTRON_PLUGIN}
-if [ $? -ne 0 ]; then
- echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
- echo " ${SUPPORTED_PLUGINS[*]}"
- exit 0
-fi
-
-echo "Neutron plugin: ${NEUTRON_PLUGIN}"
-
-if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Neutron hostname:"
- read Q_HOST
-fi
-
-Q_PORT=9696
-Q_CONF=/etc/neutron/neutron.conf
-# QPID
-openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
-openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-
-case "${NEUTRON_PLUGIN}" in
-"linuxbridge")
- LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.BridgeInterfaceDriver
- openstack-config --set ${L3_CONF} DEFAULT external_network_bridge ''
-;;
-
-"openvswitch")
- if ! rpm -q openvswitch > /dev/null
- then
- echo "Please install openvswitch"
- exit 0
- fi
- LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.OVSInterfaceDriver
-;;
-
-esac
-
-# Keystone specific
-OS_USERNAME=${OS_USERNAME:-neutron}
-OS_PASSWORD=${OS_PASSWORD:-servicepass}
-OS_AUTH_URL=${OS_AUTH_URL:-http://localhost:35357/v2.0/}
-OS_TENANT_NAME=${OS_TENANT_NAME:-service}
-
-# Update Keystone
-openstack-config --set ${L3_META_CONF} DEFAULT auth_url ${OS_AUTH_URL}
-openstack-config --set ${L3_META_CONF} DEFAULT admin_user ${OS_USERNAME}
-openstack-config --set ${L3_META_CONF} DEFAULT admin_password ${OS_PASSWORD}
-openstack-config --set ${L3_META_CONF} DEFAULT admin_tenant_name ${OS_TENANT_NAME}
-
-# Update interface driver
-openstack-config --set ${L3_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
-
-echo "Configuration updates complete!"
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/lbaas_agent.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/linuxbridge/linuxbridge_conf.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/metadata_agent.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/metadata-agent.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
[ -f $config ] || exit 6
done
echo -n $"Starting $prog: "
- daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+ daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/metering_agent.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/mlnx/mlnx_conf.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/nec/nec.ini" \
)
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (C) 2012, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-# The script supports the plugins below
-declare -a SUPPORTED_PLUGINS=(linuxbridge openvswitch)
-
-#
-# Print --help output and exit.
-#
-usage() {
-
-cat << EOF
-The helper script will install the necessary support for the selected plugin.
-
-Usage: neutron-node-setup [options]
-Options:
- --help | -h
- Print usage information.
- --plugin | -p
- The neutron plugin. Supported plugins:-
- ${SUPPORTED_PLUGINS[*]}
- --qhost | -q
- The Neutron hostname (assumes that this is also the QPID host).
-EOF
-
- exit 0
-}
-
-is_valid_plugin() {
- local i=
- for i in "${SUPPORTED_PLUGINS[@]}"; do
- if [ "$i" == "$1" ]; then
- return 0
- fi
- done
- return 1
-}
-
-NEUTRON_USER=neutron
-LB_CONF=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
-OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-
-# Nova specific
-NOVA_CONF=/etc/nova/nova.conf
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -h|--help)
- usage
- ;;
- -p|--plugin)
- shift
- NEUTRON_PLUGIN=${1}
- ;;
- -q|--qhost)
- shift
- Q_HOST=${1}
- ;;
- *)
- # ignore
- shift
- ;;
- esac
- shift
-done
-
-# if the plugin is not defined
-if [ -z ${NEUTRON_PLUGIN} ] ; then
- echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
- echo "Choice:"
- read NEUTRON_PLUGIN
-fi
-
-# check that the plugin is valid
-is_valid_plugin ${NEUTRON_PLUGIN}
-if [ $? -ne 0 ]; then
- echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
- echo " ${SUPPORTED_PLUGINS[*]}"
- exit 0
-fi
-
-echo "Neutron plugin: ${NEUTRON_PLUGIN}"
-
-if ! [ -e "/etc/neutron/plugins/${NEUTRON_PLUGIN}" ]; then
- echo "Please install the ${NEUTRON_PLUGIN} neutron plugin"
- exit 0
-fi
-
-#if the database hostname and is not defined and is required
-if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Neutron hostname:"
- read Q_HOST
-fi
-
-Q_PORT=9696
-Q_CONF=/etc/neutron/neutron.conf
-# QPID
-openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
-openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-
-case "${NEUTRON_PLUGIN}" in
-"linuxbridge")
-;;
-
-"openvswitch")
- if ! rpm -q openvswitch > /dev/null
- then
- echo "Please install openvswitch"
- exit 0
- fi
- OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
- openstack-config --set ${OVS_CONF} SECURITYGROUP firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
-;;
-
-esac
-
-echo "Would you like to update the nova configuration files? (y/n): "
-read response
-case "$response" in
-y|Y)
- ;;
-*)
- echo "Complete!"
- exit 0
-esac
-
-# Keystone specific
-OS_USERNAME=${OS_USERNAME:-neutron}
-OS_PASSWORD=${OS_PASSWORD:-servicepass}
-OS_AUTH_URL=${OS_AUTH_URL:-http://127.0.0.1:35357/v2.0/}
-OS_TENANT_NAME=${OS_TENANT_NAME:-service}
-
-# If OpenStack is installed then configure nova.conf
-if ! [ -e "${NOVA_CONF}" ]; then
- echo "Please install OpenStack compute and then set the values"
- echo "in /etc/nova/nova.conf DEFAULT section"
- echo " network_api_class=nova.network.neutronv2.api.API"
- echo " neutron_admin_username=${OS_USERNAME}"
- echo " neutron_admin_password=${OS_PASSWORD}"
- echo " neutron_admin_auth_url=${OS_AUTH_URL}"
- echo " neutron_auth_strategy=keystone"
- echo " neutron_admin_tenant_name=${OS_TENANT_NAME}"
- echo " neutron_url=http://${Q_HOST}:${Q_PORT}/"
- echo " firewall_driver=nova.virt.firewall.NoopFirewallDriver"
- echo " security_group_api=neutron"
-else
- openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.neutronv2.api.API
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_username ${OS_USERNAME}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_password ${OS_PASSWORD}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_auth_url ${OS_AUTH_URL}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_auth_strategy keystone
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_tenant_name ${OS_TENANT_NAME}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_url http://${Q_HOST}:${Q_PORT}/
- openstack-config --set ${NOVA_CONF} DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
- openstack-config --set ${NOVA_CONF} DEFAULT security_group_api neutron
-fi
-
-echo "Configuration updates complete!"
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/ovs-agent.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
[ -f $config ] || exit 6
done
echo -n $"Starting $prog: "
- daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+ daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
exec="/usr/bin/$prog"
pidfile="/var/run/$proj/$prog.pid"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/plugins/ryu/ryu.ini" \
)
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (C) 2012, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-# The script supports the plugins below
-declare -a SUPPORTED_PLUGINS=(linuxbridge openvswitch)
-
-#
-# Print --help output and exit.
-#
-usage() {
-
-cat << EOF
-The helper script will install the necessary database support for the selected plugin.
-Please note that some plugins do not require database support. These are addressed in the script.
-The setup of MySQL with a multi-server OpenStack installation is outside of the scope of
-this simple helper script.
-
-Usage: neutron-server-setup [options]
-Options:
- --help | -h
- Print usage information.
- --qpw <pw> | -q <pw>
- Specify the password for the 'neutron' MySQL user that neutron will
- use to connect to the 'neutron' MySQL database. By default,
- the password 'neutron' will be used.
-
- --rootpw <pw> | -r <pw>
- Specify the root MySQL password. If the script installs
- the MySQL server, it will set the root password to this value
- instead of prompting for a password. If the MySQL server is
- already installed, this password will be used to connect to the
- database instead of having to prompt for it.
- --yes | -y
- In cases where the script would normally ask for confirmation
- before doing something, such as installing mysql-server,
- just assume yes. This is useful if you want to run the script
- non-interactively.
- --user | -u
- The neutron user.
- --plugin | -p
- The neutron plugin. Supported plugins:-
- ${SUPPORTED_PLUGINS[*]}
-EOF
-
- exit 0
-}
-
-install_mysql_server() {
- if [ -z "${ASSUME_YES}" ] ; then
- yum install mysql-server
- else
- yum install -y mysql-server
- fi
-}
-
-start_mysql_server() {
- service mysqld start
-}
-
-is_valid_plugin() {
- local i=
- for i in "${SUPPORTED_PLUGINS[@]}"; do
- if [ "$i" == "$1" ]; then
- return 0
- fi
- done
- return 1
-}
-
-ASSUME_YES=""
-NEUTRON_USER=neutron
-MYSQL_Q_PW=neutron
-Q_CONF=/etc/neutron/neutron.conf
-LB_CONF=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
-OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-Q_HOST='localhost'
-Q_PORT=9696
-
-# Keystone specific
-OS_USERNAME=${OS_USERNAME:-neutron}
-OS_PASSWORD=${OS_PASSWORD:-servicepass}
-OS_AUTH_URL=${OS_AUTH_URL:-http://127.0.0.1:35357/v2.0/}
-OS_TENANT_NAME=${OS_TENANT_NAME:-service}
-
-# Nova specific
-NOVA_CONF=/etc/nova/nova.conf
-SCHEDULER_DRIVER=""
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -h|--help)
- usage
- ;;
- -q|--qpw)
- shift
- MYSQL_Q_PW==${1}
- ;;
- -r|--rootpw)
- shift
- MYSQL_ROOT_PW=${1}
- ;;
- -y|--yes)
- ASSUME_YES="yes"
- ;;
- -u|--user)
- shift
- NEUTRON_USER=${1}
- ;;
- -p|--plugin)
- shift
- NEUTRON_PLUGIN=${1}
- ;;
- *)
- # ignore
- shift
- ;;
- esac
- shift
-done
-
-# if the plugin is not defined
-if [ -z ${NEUTRON_PLUGIN} ] ; then
- echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
- echo "Choice:"
- read NEUTRON_PLUGIN
-fi
-
-# check that the plugin is valid
-is_valid_plugin ${NEUTRON_PLUGIN}
-if [ $? -ne 0 ]; then
- echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
- echo " ${SUPPORTED_PLUGINS[*]}"
- exit 0
-fi
-
-echo "Neutron plugin: ${NEUTRON_PLUGIN}"
-
-if ! [ -e "${Q_CONF}" ]; then
- echo "Please install the neutron package"
- exit 0
-fi
-
-if ! [ -e "/etc/neutron/plugins/${NEUTRON_PLUGIN}" ]; then
- echo "Please install the ${NEUTRON_PLUGIN} neutron plugin"
- exit 0
-fi
-
-case "${NEUTRON_PLUGIN}" in
-"linuxbridge")
- DB_NAME="neutron_linux_bridge"
- Q_PLUGIN_CLASS="neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"
-;;
-
-"openvswitch")
- if ! rpm -q openvswitch > /dev/null
- then
- echo "Please install openvswitch"
- exit 0
- fi
- DB_NAME="ovs_neutron"
- Q_PLUGIN_CLASS="neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
-;;
-esac
-
-# Update neutron.conf
-# Plugin
-openstack-config --set ${Q_CONF} DEFAULT core_plugin $Q_PLUGIN_CLASS
-# QPID
-openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
-openstack-config --set ${Q_CONF} DEFAULT qpid_hostname localhost
-# Authentication
-openstack-config --set ${Q_CONF} DEFAULT auth_strategy keystone
-
-openstack-config --del ${Q_CONF} keystone_authtoken admin_tenant_name
-openstack-config --del ${Q_CONF} keystone_authtoken admin_user
-openstack-config --del ${Q_CONF} keystone_authtoken admin_password
-
-openstack-config --set ${Q_CONF} keystone_authtoken admin_tenant_name ${OS_TENANT_NAME}
-openstack-config --set ${Q_CONF} keystone_authtoken admin_user ${OS_USERNAME}
-openstack-config --set ${Q_CONF} keystone_authtoken admin_password ${OS_PASSWORD}
-
-echo "Plugin: ${NEUTRON_PLUGIN} => Database: ${DB_NAME}"
-
-# Make sure MySQL is installed.
-
-NEW_MYSQL_INSTALL=0
-if ! rpm -q mysql-server > /dev/null
-then
- if [ -z "${ASSUME_YES}" ] ; then
- printf "mysql-server is not installed. Would you like to install it now? (y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- n|N)
- echo "mysql-server must be installed. Please install it before proceeding."
- exit 0
- ;;
- *)
- echo "Invalid response."
- exit 1
- esac
- fi
-
- NEW_MYSQL_INSTALL=1
- install_mysql_server
-fi
-
-
-# Make sure mysqld is running.
-
-if ! service mysqld status > /dev/null
-then
- if [ -z "${ASSUME_YES}" ] ; then
- printf "mysqld is not running. Would you like to start it now? (y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- n|N)
- echo "mysqld must be running. Please start it before proceeding."
- exit 0
- ;;
- *)
- echo "Invalid response."
- exit 1
- esac
- fi
-
- start_mysql_server
-
- # If we both installed and started, ensure it starts at boot
- [ $NEW_MYSQL_INSTALL -eq 1 ] && chkconfig mysqld on
-fi
-
-# Get MySQL root access.
-if [ $NEW_MYSQL_INSTALL -eq 1 ]
-then
- if [ ! "${MYSQL_ROOT_PW+defined}" ] ; then
- echo "Since this is a fresh installation of MySQL, please set a password for the 'root' mysql user."
-
- PW_MATCH=0
- while [ $PW_MATCH -eq 0 ]
- do
- printf "Enter new password for 'root' mysql user: "
- read -s MYSQL_ROOT_PW
- echo
- printf "Enter new password again: "
- read -s PW2
- echo
- if [ "${MYSQL_ROOT_PW}" = "${PW2}" ] ; then
- PW_MATCH=1
- else
- echo "Passwords did not match."
- fi
- done
- fi
-
- echo "UPDATE mysql.user SET password = password('${MYSQL_ROOT_PW}') WHERE user = 'root'; DELETE FROM mysql.user WHERE user = ''; flush privileges;" | mysql -u root
- if ! [ $? -eq 0 ] ; then
- echo "Failed to set password for 'root' MySQL user."
- exit 1
- fi
-elif [ ! "${MYSQL_ROOT_PW+defined}" ] ; then
- printf "Please enter the password for the 'root' MySQL user: "
- read -s MYSQL_ROOT_PW
- echo
-fi
-
-# Sanity check MySQL credentials.
-
-MYSQL_ROOT_PW_ARG=""
-if [ "${MYSQL_ROOT_PW+defined}" ]
-then
- MYSQL_ROOT_PW_ARG="--password=${MYSQL_ROOT_PW}"
-fi
-echo "SELECT 1;" | mysql -u root ${MYSQL_ROOT_PW_ARG} > /dev/null
-if ! [ $? -eq 0 ]
-then
- echo "Failed to connect to the MySQL server. Please check your root user credentials."
- exit 1
-fi
-echo "Verified connectivity to MySQL."
-
-# Create a database user - check if it does not exist prior
-USER_EXISTS=$(mysql -u root ${MYSQL_ROOT_PW_ARG} -e "SELECT user FROM mysql.user WHERE user='${NEUTRON_USER}'"|grep ${NEUTRON_USER} | wc -l)
-if [ ${USER_EXISTS} -ne 0 ]; then
- echo "User ${NEUTRON_USER} already exists"
-else
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${NEUTRON_USER}'@'%' identified by '${MYSQL_Q_PW}'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${NEUTRON_USER}'@'localhost' identified by '${MYSQL_Q_PW}'"
-fi
-
-#create database
-DB_EXISTS=$(mysql -u root ${MYSQL_ROOT_PW_ARG} -e "show databases"|grep ${DB_NAME}| wc -l)
-if [ ${DB_EXISTS} -ne 0 ]; then
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "drop database ${DB_NAME}"
-fi
-mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create database ${DB_NAME}"
-
-# Configure database specifics
-case "${NEUTRON_PLUGIN}" in
-"linuxbridge")
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${NEUTRON_USER}'@'%'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${NEUTRON_USER}'@'localhost'"
- openstack-config --set ${LB_CONF} DATABASE sql_connection mysql://${NEUTRON_USER}:${MYSQL_Q_PW}@`hostname`/neutron_linux_bridge
-
- echo "Please enter network device for VLAN trunking:"
- read NETWORK_DEVICE
- openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
-
- ln -s ${LB_CONF} /etc/neutron/plugin.ini
-;;
-
-"openvswitch")
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${NEUTRON_USER}'@'%'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${NEUTRON_USER}'@'localhost'"
- openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${NEUTRON_USER}:${MYSQL_Q_PW}@`hostname`/ovs_neutron
- openstack-config --set ${OVS_CONF} SECURITYGROUP firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
- ln -s ${OVS_CONF} /etc/neutron/plugin.ini
-;;
-esac
-
-if [ -z "${ASSUME_YES}" ] ; then
- echo "Would you like to update the nova configuration files? (y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- *)
- echo "Complete!"
- exit 0
- esac
-fi
-
-# If OpenStack is installed then configure nova.conf
-if ! [ -e "${NOVA_CONF}" ]; then
- echo "Please install OpenStack compute and then set the values"
- echo "in /etc/nova/nova.conf DEFAULT section"
- echo " network_api_classi=nova.network.neutronv2.api.API"
- echo " neutron_admin_username=${OS_USERNAME}"
- echo " neutron_admin_password=${OS_PASSWORD}"
- echo " neutron_admin_auth_url=${OS_AUTH_URL}"
- echo " neutron_auth_strategy=keystone"
- echo " neutron_admin_tenant_name=${OS_TENANT_NAME}"
- echo " neutron_url=http://${Q_HOST}:${Q_PORT}/"
- echo " firewall_driver=nova.virt.firewall.NoopFirewallDriver"
- echo " security_group_api=neutron"
-else
- openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.neutronv2.api.API
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_username ${OS_USERNAME}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_password ${OS_PASSWORD}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_auth_url ${OS_AUTH_URL}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_auth_strategy keystone
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_admin_tenant_name ${OS_TENANT_NAME}
- openstack-config --set ${NOVA_CONF} DEFAULT neutron_url http://${Q_HOST}:${Q_PORT}/
- openstack-config --set ${NOVA_CONF} DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
- openstack-config --set ${NOVA_CONF} DEFAULT security_group_api neutron
-fi
-
-echo "Configuration updates complete!"
prog=neutron
exec="/usr/bin/$prog-server"
configs=(
+ "/usr/share/$prog/$prog-dist.conf" \
"/etc/$prog/$prog.conf" \
"/etc/$prog/plugin.ini" \
)
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/vpn_agent.ini" \
+ "/etc/$proj/l3_agent.ini" \
+ "/etc/$proj/fwaas_driver.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
respawn
-exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini" neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini" neutron
-#
-# This is 2013.2 release
-#
-%global release_name havana
+%global release_name icehouse
Name: openstack-neutron
-Version: 2013.2
-Release: 11%{?dist}
+Version: 2014.2
+Release: 1%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.3.b3
License: ASL 2.0
URL: http://launchpad.net/neutron/
-Source0: http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
+Source0: neutron-2014.2.tar.gz
Source1: neutron.logrotate
Source2: neutron-sudoers
-Source4: neutron-server-setup
-Source5: neutron-node-setup
-Source6: neutron-dhcp-setup
-Source7: neutron-l3-setup
Source10: neutron-server.init
Source20: neutron-server.upstart
Source90: neutron-dist.conf
#
-# patches_base=2013.2+1
+# patches_base=2014.1.1+1
#
-Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
-Patch0002: MIRA001-Send-DHCP-notifications-regardless-of-agent-status.patch
+Patch0001: 0001-remove-runtime-dependency-on-pbr.patch
BuildArch: noarch
# Build require these parallel versions
# as setup.py build imports neutron.openstack.common.setup
# which will then check for these
-BuildRequires: python-sqlalchemy0.7
-BuildRequires: python-webob1.2
-BuildRequires: python-paste-deploy1.5
-BuildRequires: python-routes1.12
+BuildRequires: python-sqlalchemy
+BuildRequires: python-webob
+BuildRequires: python-paste-deploy
+BuildRequires: python-routes
BuildRequires: python-jinja2-26
BuildRequires: dos2unix
BuildRequires: python-pbr
BuildRequires: python-d2to1
-
Requires: dnsmasq-utils
Requires: python-neutron = %{version}-%{release}
+Requires: python-oslo-rootwrap
Requires: openstack-utils
-Requires: python-keystone
-Requires: python-pbr
Requires(post): chkconfig
Requires(postun): initscripts
Obsoletes: python-quantum < 2013.2-0.3.b3
Requires: MySQL-python
-Requires: python-alembic
+Requires: python-alembic >= 0.6.4
Requires: python-amqplib
-Requires: python-anyjson
-Requires: python-babel
-Requires: python-eventlet
-Requires: python-greenlet
-Requires: python-httplib2
-Requires: python-iso8601
-Requires: python-jinja2-26
-Requires: python-keystoneclient
-Requires: python-kombu
+Requires: python-anyjson >= 0.3.3
+Requires: python-babel >= 1.3
+Requires: python-eventlet >= 0.13.0
+Requires: python-greenlet >= 0.3.2
+Requires: python-httplib2 >= 0.7.5
+Requires: python-iso8601 >= 0.1.9
+Requires: python-jsonrpclib
+Requires: python-jinja2
+Requires: python-keystoneclient >= 0.10.0
+Requires: python-keystonemiddleware >= 1.0.0
+Requires: python-kombu >= 2.4.8
Requires: python-lxml
-Requires: python-paste-deploy1.5
-Requires: python-routes1.12
-Requires: python-sqlalchemy0.7
-Requires: python-webob1.2
-Requires: python-netaddr
+Requires: python-oslo-messaging >= 1.4.0.0a3
+Requires: python-oslo-rootwrap >= 1.3.0.0a1
+Requires: python-requests >= 1.1
+Requires: python-paste-deploy >= 1.5
+Requires: python-routes >= 1.12.3
+Requires: python-sqlalchemy >= 0.8.4
+Requires: python-webob >= 1.2.3
+Requires: python-netaddr >= 0.7.6
Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo-db >= 0.2.0
Requires: python-qpid
-Requires: python-neutronclient
+Requires: python-neutronclient >= 2.3.5
+Requires: python-novaclient >= 2.17.0
+Requires: python-stevedore >= 0.14
+Requires: python-six >= 1.7.0
+
+Requires: python-novaclient >= 1:2.17.0
Requires: sudo
+
%description -n python-neutron
Neutron provides an API to dynamically request and configure virtual
networks.
This package contains the neutron Python library.
-%package -n openstack-neutron-bigswitch
+%package bigswitch
Summary: Neutron Big Switch plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-bigswitch
+%description bigswitch
Neutron provides an API to dynamically request and configure virtual
networks.
Networks Controller.
-%package -n openstack-neutron-brocade
+%package brocade
Summary: Neutron Brocade plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-brocade
+%description brocade
Neutron provides an API to dynamically request and configure virtual
networks.
networks using Brocade VCS switches running NOS.
-%package -n openstack-neutron-cisco
+%package cisco
Summary: Neutron Cisco plugin
Group: Applications/System
Requires: python-configobj
-%description -n openstack-neutron-cisco
+%description cisco
Neutron provides an API to dynamically request and configure virtual
networks.
networks using Cisco UCS and Nexus.
-%package -n openstack-neutron-hyperv
+%package hyperv
Summary: Neutron Hyper-V plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-hyperv
+%description hyperv
Neutron provides an API to dynamically request and configure virtual
networks.
networks using Microsoft Hyper-V.
-%package -n openstack-neutron-linuxbridge
+%package ibm
+Summary: Neutron IBM plugin
+Group: Applications/System
+
+Requires: openstack-neutron = %{version}-%{release}
+
+
+%description ibm
+Neutron provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the neutron plugin that implements virtual
+networks from IBM.
+
+
+%package linuxbridge
Summary: Neutron linuxbridge plugin
Group: Applications/System
Requires: bridge-utils
Requires: openstack-neutron = %{version}-%{release}
-Requires: python-pyudev
-%description -n openstack-neutron-linuxbridge
+%description linuxbridge
Neutron provides an API to dynamically request and configure virtual
networks.
networks as VLANs using Linux bridging.
-%package -n openstack-neutron-midonet
+%package midonet
Summary: Neutron MidoNet plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-midonet
+%description midonet
Neutron provides an API to dynamically request and configure virtual
networks.
networks using MidoNet from Midokura.
-%package -n openstack-neutron-ml2
+%package ml2
Summary: Neutron ML2 plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-ml2
+%description ml2
Neutron provides an API to dynamically request and configure virtual
networks.
for accessing those types.
-%package -n openstack-neutron-mellanox
+%package mellanox
Summary: Neutron Mellanox plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-mellanox
+%description mellanox
This plugin implements Neutron v2 APIs with support for Mellanox embedded
switch functionality as part of the VPI (Ethernet/InfiniBand) HCA.
-%package -n openstack-neutron-nicira
-Summary: Neutron Nicira plugin
-Group: Applications/System
+%package nuage
+Summary: Neutron Nuage plugin
+Group: Applications/System
-Provides: openstack-quantum-nicira = %{version}-%{release}
-Obsoletes: openstack-quantum-nicira < 2013.2-0.3.b3
+Requires: openstack-neutron = %{version}-%{release}
+
+
+%description nuage
+This plugin implements Neutron v2 APIs with support for Nuage Networks
+Virtual Service Platform (VSP).
+
+
+%package ofagent
+Summary: Neutron ofagent plugin from ryu project
+Group: Applications/system
Requires: openstack-neutron = %{version}-%{release}
+%description ofagent
+This plugin implements Neutron v2 APIs with support for the ryu ofagent
+plugin.
-%description -n openstack-neutron-nicira
-Neutron provides an API to dynamically request and configure virtual
+
+%package oneconvergence-nvsd
+Summary: Neutron One Convergence NVSD plugin
+Group: Applications/System
+
+Requires: openstack-neutron = %{version}-%{release}
+
+
+%description oneconvergence-nvsd
+Neutron provides an API to dynamnically request and configure virtual
networks.
This package contains the neutron plugin that implements virtual
-networks using Nicira NVP.
+networks using One Convergence NVSD
+
+%package opencontrail
+Summary: Neutron opencontrail plugin
+Group: Applications/System
+
+Requires: openstack-neutron = %{version}-%{release}
+
+%description opencontrail
-%package -n openstack-neutron-openvswitch
+%package openvswitch
Summary: Neutron openvswitch plugin
Group: Applications/System
Requires: openvswitch
-%description -n openstack-neutron-openvswitch
+%description openvswitch
Neutron provides an API to dynamically request and configure virtual
networks.
networks using Open vSwitch.
-%package -n openstack-neutron-plumgrid
+%package plumgrid
Summary: Neutron PLUMgrid plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-plumgrid
+%description plumgrid
Neutron provides an API to dynamically request and configure virtual
networks.
networks using the PLUMgrid platform.
-%package -n openstack-neutron-ryu
+%package ryu
Summary: Neutron Ryu plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-ryu
+%description ryu
Neutron provides an API to dynamically request and configure virtual
networks.
networks using the Ryu Network Operating System.
-%package -n openstack-neutron-nec
+%package nec
Summary: Neutron NEC plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-nec
+%description nec
Neutron provides an API to dynamically request and configure virtual
networks.
networks using the NEC OpenFlow controller.
-%package -n openstack-neutron-metaplugin
+%package metaplugin
Summary: Neutron meta plugin
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-metaplugin
+%description metaplugin
Neutron provides an API to dynamically request and configure virtual
networks.
networks using multiple other neutron plugins.
-%package -n openstack-neutron-metering-agent
+%package vmware
+Summary: Neutron VMWare NSX support
+Group: Applications/System
+
+Requires: openstack-neutron = %{version}-%{release}
+Provides: openstack-neutron-nicira = %{version}-%{release}
+Obsoletes: openstack-neutron-nicira < 2014.1-4
+
+%description vmware
+This package adds VMWare NSX support for neutron
+
+
+%package metering-agent
Summary: Neutron bandwidth metering agent
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-metering-agent
+%description metering-agent
Neutron provides an API to measure bandwidth utilization
This package contains the neutron agent responsible for generating bandwidth
utilization notifications.
-%package -n openstack-neutron-vpn-agent
+
+%package vpn-agent
Summary: Neutron VPNaaS agent
Group: Applications/System
Requires: openstack-neutron = %{version}-%{release}
-%description -n openstack-neutron-vpn-agent
+%description vpn-agent
Neutron provides an API to implement VPN as a service
This package contains the neutron agent responsible for implenting VPNaaS with
%setup -q -n neutron-%{version}
%patch0001 -p1
-#%patch0002 -p1
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
+# Ensure SOURCES.txt ends in a newline and if any patches have added files, append them to SOURCES.txt
+[ -n "$(tail -c 1 < neutron.egg-info/SOURCES.txt)" ] && echo >> neutron.egg-info/SOURCES.txt
+if ls %{_sourcedir}/*.patch >/dev/null 2>&1; then
+awk '/^new file/ {split(a,files," ");print substr(files[3],3)} {a = $0}' %{_sourcedir}/*.patch >> neutron.egg-info/SOURCES.txt
+fi
+
+sed -i 's/RPMVERSION/%{version}/; s/RPMRELEASE/%{release}/' neutron/version.py
+
chmod 644 neutron/plugins/cisco/README
# Let's handle dependencies ourseleves
# Move config files to proper location
install -d -m 755 %{buildroot}%{_sysconfdir}/neutron
mv %{buildroot}/usr/etc/neutron/* %{buildroot}%{_sysconfdir}/neutron
+mv %{buildroot}%{_sysconfdir}/neutron/api-paste.ini %{buildroot}%{_datadir}/neutron/api-paste.ini
chmod 640 %{buildroot}%{_sysconfdir}/neutron/plugins/*/*.ini
+# TODO: remove this once the plugin is separately packaged
+rm %{buildroot}%{_sysconfdir}/neutron/plugins/embrane/heleos_conf.ini
+
# Install logrotate
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-neutron
install -d -m 755 %{buildroot}%{_localstatedir}/log/neutron
install -d -m 755 %{buildroot}%{_localstatedir}/run/neutron
-# Install setup helper scripts
-install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/neutron-server-setup
-install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/neutron-node-setup
-install -p -D -m 755 %{SOURCE6} %{buildroot}%{_bindir}/neutron-dhcp-setup
-install -p -D -m 755 %{SOURCE7} %{buildroot}%{_bindir}/neutron-l3-setup
-
# Install upstart jobs examples
install -p -m 644 %{SOURCE20} %{buildroot}%{_datadir}/neutron/
install -p -m 644 %{SOURCE21} %{buildroot}%{_datadir}/neutron/
sed -re 's/[0-6]:off//g
s/([0-6]):on\s*/\1/g
s/quantum/neutron/g
+ s/^([a-z0-9-]+)\s+$/chkconfig \1 off/
s/^([a-z0-9-]+)\s+([0-6]+)/chkconfig --levels \2 \1 on/' > %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
fi
fi
-%post -n openstack-neutron-linuxbridge
+%post linuxbridge
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-linuxbridge-agent
fi
-%preun -n openstack-neutron-linuxbridge
+%preun linuxbridge
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-linuxbridge-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-linuxbridge-agent
fi
-%postun -n openstack-neutron-linuxbridge
+%postun linuxbridge
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-linuxbridge-agent condrestart >/dev/null 2>&1 || :
fi
-%post -n openstack-neutron-openvswitch
+%post openvswitch
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-openvswitch-agent
fi
-%preun -n openstack-neutron-openvswitch
+%preun openvswitch
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-openvswitch-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-openvswitch-agent
fi
-%postun -n openstack-neutron-openvswitch
+%postun openvswitch
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-openvswitch-agent condrestart >/dev/null 2>&1 || :
fi
-%post -n openstack-neutron-ryu
+%post ryu
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-ryu-agent
fi
-%preun -n openstack-neutron-ryu
+%preun ryu
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-ryu-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-ryu-agent
fi
-%postun -n openstack-neutron-ryu
+%postun ryu
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-ryu-agent condrestart >/dev/null 2>&1 || :
fi
-%post -n openstack-neutron-nec
+%post nec
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-nec-agent
fi
-%preun -n openstack-neutron-nec
+%preun nec
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-nec-agent stop >/dev/null 2>&1
fi
-%postun -n openstack-neutron-nec
+%postun nec
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
fi
-%post -n openstack-neutron-mellanox
+%post mellanox
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-mlnx-agent
fi
-%preun -n openstack-neutron-mellanox
+%preun mellanox
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-mlnx-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-mlnx-agent
fi
-%postun -n openstack-neutron-mellanox
+%postun mellanox
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-mlnx-agent condrestart >/dev/null 2>&1 || :
fi
-%post -n openstack-neutron-vpn-agent
+%post vpn-agent
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-vpn-agent
fi
-%preun -n openstack-neutron-vpn-agent
+%preun vpn-agent
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-vpn-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-vpn-agent
fi
-%postun -n openstack-neutron-vpn-agent
+%postun vpn-agent
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-vpn-agent condrestart >/dev/null 2>&1 || :
fi
-%post -n openstack-neutron-metering-agent
+%post metering-agent
if [ $1 -eq 1 ] ; then
# Initial installation
/sbin/chkconfig --add neutron-metering-agent
fi
-%preun -n openstack-neutron-metering-agent
+%preun metering-agent
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/sbin/service neutron-metering-agent stop >/dev/null 2>&1
/sbin/chkconfig --del neutron-metering-agent
fi
-%postun -n openstack-neutron-metering-agent
+%postun metering-agent
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service neutron-metering-agent condrestart >/dev/null 2>&1 || :
%files
%doc LICENSE
%doc README.rst
-%{_bindir}/quantum-db-manage
-%{_bindir}/quantum-debug
-%{_bindir}/quantum-dhcp-agent
-%{_bindir}/quantum-l3-agent
-%{_bindir}/quantum-lbaas-agent
-%{_bindir}/quantum-metadata-agent
-%{_bindir}/quantum-netns-cleanup
-%{_bindir}/quantum-ns-metadata-proxy
-%{_bindir}/quantum-rootwrap
-%{_bindir}/quantum-rootwrap-xen-dom0
-%{_bindir}/quantum-server
-%{_bindir}/quantum-usage-audit
+%{_bindir}/neutron-cisco-cfg-agent
%{_bindir}/neutron-db-manage
%{_bindir}/neutron-debug
%{_bindir}/neutron-dhcp-agent
-%{_bindir}/neutron-dhcp-setup
%{_bindir}/neutron-l3-agent
-%{_bindir}/neutron-l3-setup
%{_bindir}/neutron-lbaas-agent
%{_bindir}/neutron-metadata-agent
%{_bindir}/neutron-netns-cleanup
-%{_bindir}/neutron-node-setup
%{_bindir}/neutron-ns-metadata-proxy
%{_bindir}/neutron-rootwrap
%{_bindir}/neutron-rootwrap-xen-dom0
+%{_bindir}/neutron-sanity-check
%{_bindir}/neutron-server
-%{_bindir}/neutron-server-setup
%{_bindir}/neutron-usage-audit
+%{_bindir}/neutron-sriov-nic-agent
%{_initrddir}/neutron-server
%{_initrddir}/neutron-dhcp-agent
%dir %{_sysconfdir}/neutron
%{_sysconfdir}/neutron/release
%attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/api-paste.ini
+%attr(-, root, neutron) %{_datadir}/neutron/api-paste.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
%doc LICENSE
%doc README.rst
%{python_sitelib}/neutron
-%{python_sitelib}/quantum
%exclude %{python_sitelib}/neutron/plugins/bigswitch
%exclude %{python_sitelib}/neutron/plugins/brocade
%exclude %{python_sitelib}/neutron/plugins/cisco
%exclude %{python_sitelib}/neutron/plugins/hyperv
+%exclude %{python_sitelib}/neutron/plugins/ibm
%exclude %{python_sitelib}/neutron/plugins/linuxbridge
%exclude %{python_sitelib}/neutron/plugins/metaplugin
%exclude %{python_sitelib}/neutron/plugins/midonet
%exclude %{python_sitelib}/neutron/plugins/ml2
%exclude %{python_sitelib}/neutron/plugins/mlnx
+%exclude %{python_sitelib}/neutron/plugins/nuage
%exclude %{python_sitelib}/neutron/plugins/nec
-%exclude %{python_sitelib}/neutron/plugins/nicira
+%exclude %{python_sitelib}/neutron/plugins/ofagent
+%exclude %{python_sitelib}/neutron/plugins/oneconvergence
%exclude %{python_sitelib}/neutron/plugins/openvswitch
%exclude %{python_sitelib}/neutron/plugins/plumgrid
%exclude %{python_sitelib}/neutron/plugins/ryu
+%exclude %{python_sitelib}/neutron/plugins/vmware
%{python_sitelib}/neutron-%%{version}*.egg-info
-%files -n openstack-neutron-bigswitch
+%files bigswitch
%doc LICENSE
%doc neutron/plugins/bigswitch/README
+%{_bindir}/neutron-restproxy-agent
%{python_sitelib}/neutron/plugins/bigswitch
%dir %{_sysconfdir}/neutron/plugins/bigswitch
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
+%doc %{_sysconfdir}/neutron/plugins/bigswitch/README
-%files -n openstack-neutron-brocade
+%files brocade
%doc LICENSE
%doc neutron/plugins/brocade/README.md
%{python_sitelib}/neutron/plugins/brocade
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/*.ini
-%files -n openstack-neutron-cisco
+%files cisco
%doc LICENSE
%doc neutron/plugins/cisco/README
%{python_sitelib}/neutron/plugins/cisco
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/cisco/*.ini
-%files -n openstack-neutron-hyperv
+%files hyperv
%doc LICENSE
#%%doc neutron/plugins/hyperv/README
%{_bindir}/neutron-hyperv-agent
-%{_bindir}/quantum-hyperv-agent
%{python_sitelib}/neutron/plugins/hyperv
%dir %{_sysconfdir}/neutron/plugins/hyperv
%exclude %{python_sitelib}/neutron/plugins/hyperv/agent
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/hyperv/*.ini
-%files -n openstack-neutron-linuxbridge
+%files ibm
+%doc LICENSE
+%{_bindir}/neutron-ibm-agent
+#%{_bindir}/quantum-ibm-agent
+%doc neutron/plugins/ibm/README
+%{python_sitelib}/neutron/plugins/ibm
+%dir %{_sysconfdir}/neutron/plugins/ibm
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ibm/*.ini
+
+
+%files linuxbridge
%doc LICENSE
%doc neutron/plugins/linuxbridge/README
%{_bindir}/neutron-linuxbridge-agent
-%{_bindir}/quantum-linuxbridge-agent
+#%{_bindir}/quantum-linuxbridge-agent
%{_initrddir}/neutron-linuxbridge-agent
%{_datadir}/neutron/neutron-linuxbridge-agent.upstart
%{python_sitelib}/neutron/plugins/linuxbridge
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/linuxbridge/*.ini
-%files -n openstack-neutron-midonet
+%files midonet
%doc LICENSE
#%%doc neutron/plugins/midonet/README
%{python_sitelib}/neutron/plugins/midonet
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/midonet/*.ini
-%files -n openstack-neutron-ml2
+%files ml2
%doc neutron/plugins/ml2/README
%{python_sitelib}/neutron/plugins/ml2
%dir %{_sysconfdir}/neutron/plugins/ml2
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ml2/*.ini
-%files -n openstack-neutron-mellanox
+%files mellanox
%doc neutron/plugins/mlnx/README
%{_bindir}/neutron-mlnx-agent
-%{_bindir}/quantum-mlnx-agent
+#%{_bindir}/quantum-mlnx-agent
%{python_sitelib}/neutron/plugins/mlnx
%{_initrddir}/neutron-mlnx-agent
%{_datadir}/neutron/neutron-mlnx-agent.upstart
%dir %{_sysconfdir}/neutron/plugins/mlnx
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
-
-%files -n openstack-neutron-nicira
+%files nuage
%doc LICENSE
-%doc neutron/plugins/nicira/README
-%{_bindir}/neutron-check-nvp-config
-%{_bindir}/quantum-check-nvp-config
-%{python_sitelib}/neutron/plugins/nicira
-%dir %{_sysconfdir}/neutron/plugins/nicira
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
+%{python_sitelib}/neutron/plugins/nuage
+%dir %{_sysconfdir}/neutron/plugins/nuage
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
+%files ofagent
+%doc neutron/plugins/ofagent/README
+%{_bindir}/neutron-ofagent-agent
+%{python_sitelib}/neutron/plugins/ofagent
-%files -n openstack-neutron-openvswitch
+
+%files oneconvergence-nvsd
+%doc LICENSE
+%doc neutron/plugins/oneconvergence/README
+%dir %{_sysconfdir}/neutron/plugins/oneconvergence
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/oneconvergence/nvsdplugin.ini
+%{_bindir}/neutron-nvsd-agent
+#%{_bindir}/quantum-nvsd-agent
+%{python_sitelib}/neutron/plugins/oneconvergence
+
+%files opencontrail
+%dir %{_sysconfdir}/neutron/plugins/opencontrail
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/opencontrail/*.ini
+
+%files openvswitch
%doc LICENSE
%doc neutron/plugins/openvswitch/README
%{_bindir}/neutron-openvswitch-agent
-%{_bindir}/quantum-openvswitch-agent
%{_bindir}/neutron-ovs-cleanup
-%{_bindir}/quantum-ovs-cleanup
+#%{_bindir}/quantum-ovs-cleanup
%{_initrddir}/neutron-openvswitch-agent
%{_datadir}/neutron/neutron-openvswitch-agent.upstart
%{_initrddir}/neutron-ovs-cleanup
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/openvswitch/*.ini
-%files -n openstack-neutron-plumgrid
+%files plumgrid
%doc LICENSE
%doc neutron/plugins/plumgrid/README
%{python_sitelib}/neutron/plugins/plumgrid
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/plumgrid/*.ini
-%files -n openstack-neutron-ryu
+%files ryu
%doc LICENSE
%doc neutron/plugins/ryu/README
%{_bindir}/neutron-ryu-agent
-%{_bindir}/quantum-ryu-agent
+#%{_bindir}/quantum-ryu-agent
%{_initrddir}/neutron-ryu-agent
%{_datadir}/neutron/neutron-ryu-agent.upstart
%{python_sitelib}/neutron/plugins/ryu
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
-%files -n openstack-neutron-nec
+%files nec
%doc LICENSE
%doc neutron/plugins/nec/README
%{_bindir}/neutron-nec-agent
-%{_bindir}/quantum-nec-agent
+#%{_bindir}/quantum-nec-agent
%{_initrddir}/neutron-nec-agent
%{_datadir}/neutron/neutron-nec-agent.upstart
%{python_sitelib}/neutron/plugins/nec
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nec/*.ini
-%files -n openstack-neutron-metaplugin
+%files metaplugin
%doc LICENSE
%doc neutron/plugins/metaplugin/README
%{python_sitelib}/neutron/plugins/metaplugin
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini
-%files -n openstack-neutron-metering-agent
+%files metering-agent
%doc LICENSE
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini
%{_initrddir}/neutron-metering-agent
%{_bindir}/neutron-metering-agent
-%files -n openstack-neutron-vpn-agent
+%files vmware
+%doc LICENSE
+%{_bindir}/neutron-check-nsx-config
+%{_bindir}/neutron-nsx-manage
+%{python_sitelib}/neutron/plugins/vmware
+%dir %{_sysconfdir}/neutron/plugins/vmware
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
+
+
+
+%files vpn-agent
%doc LICENSE
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
%{_initrddir}/neutron-vpn-agent
%changelog
+* Tue Aug 19 2014 Jenkins <jenkins@review.openstack.org> - 2014.2.b2-fuel5.1.mira0
+- 921969d Merge "Remove INACTIVE status from FWaaS"
+- 0954a7a Merge "Skip FWaaS config mismatch check if RPC method is unsupported"
+- 06254d8 Merge "Replace nullable from primary keys in tz_network_bindings with default"
+- f907677 Merge "Implement namespace cleanup for new DVR namespaces"
+- e87f003 Merge "Cisco N1kv plugin to send subtype on network profile creation"
+- 1c79667 Merge "Imported Translations from Transifex"
+- 02f637b Merge "Do not assume order of new_peers list elements"
+- ac6e919 Imported Translations from Transifex
+- 7384726 Merge "Option to remove routers from dead l3 agents"
+- 9bf0e66 Remove auto-generation of db schema from models at startup
+- e6ffc08 Cisco N1kv plugin to send subtype on network profile creation
+- 0852937 Merge "correct getLoggers to use __name__ in code"
+- 163e8ed Implement namespace cleanup for new DVR namespaces
+- 2d6a8c5 Merge "Opencontrail plug-in implementation for core resources"
+- 2738c70 Merge "Updated from global requirements"
+- 0ae82b6 Merge "Fix duplicate function: test_getattr_unallowed_attr"
+- 2de862e correct getLoggers to use __name__ in code
+- ca00b17 Skip FWaaS config mismatch check if RPC method is unsupported
+- 4bc2dfe Merge "Fix PortNotFound error during update_device_up for DVR"
+- 1694d24 Merge "Define some abstract methods in VpnDriver class"
+- f9069e1 Merge "Fixing neutron-db-manage with some options other than upgrade/downgrade"
+- 42df056 Merge "NSX: lift restriction on DVR update"
+- 9fc8b6c NSX: lift restriction on DVR update
+- b5b89bb Updated from global requirements
+- f9981d0 Merge "Preserve link local IP allocations for DVR fip ns across restart"
+- 0726bdd Merge "l2pop: get_agent_ports: Don't yield (None, {})"
+- eae5f5d Merge "ML2: Make get_device_details report mac address as well"
+- 905c278 Merge "Fix session's InvalidRequestError because of nested rollback"
+- bdd4a7c Merge "Predictable field and filter ordering"
+- 43b6efd Merge "Use jsonutils instead of stdlib json"
+- 0a75865 Use jsonutils instead of stdlib json
+- 83a88b0 Merge "Remove SELECT FOR UPDATE use in ML2 tunnel driver add_endpoint"
+- 8b89667 Merge "Fix interface add for dvr with gateway"
+- 9978423 Merge "Delete DVR namespaces on node after removing last VM"
+- 842d288 Merge "VPNaaS: Cisco fix validation for GW IP"
+- 7d94a40 Merge "Remove ignored do_request timeout argument"
+- c3760e5 Remove INACTIVE status from FWaaS
+- e10ebc2 Merge "Fix KeyError during sync_routers"
+- dbffb98 Merge "Fix PortNotFound exception during sync_routers"
+- 11ca12d Fix interface add for dvr with gateway
+- 0125cf7 l2pop: get_agent_ports: Don't yield (None, {})
+- b5a2da7 ML2: Make get_device_details report mac address as well
+- d10a909 Merge "Imported Translations from Transifex"
+- 09c22e5 Merge "Fix 404 error fetching metadata when using DVR"
+- 69ce923 Delete DVR namespaces on node after removing last VM
+- b025ccf Fix PortNotFound error during update_device_up for DVR
+- ce2d3ff Merge "add auth token to context"
+- 9677cf8 Option to remove routers from dead l3 agents
+- bc49650 Remove SELECT FOR UPDATE use in ML2 tunnel driver add_endpoint
+- aee5344 Fix KeyError during sync_routers
+- 2affc39 Fix PortNotFound exception during sync_routers
+- 7370b3d VPNaaS: Cisco fix validation for GW IP
+- 76dd028 Merge "NSX: unify the two distributed routing extensions"
+- e2c7249 Merge "Remove unneeded device_owner field from l2pop tuple"
+- a381d1b Imported Translations from Transifex
+- 754b1dd Fix duplicate function: test_getattr_unallowed_attr
+- 40a4c36 Merge "NSX: fix wording for configuration option"
+- 6e8cbf8 Merge "Raise exception for network delete with subnets presents"
+- 34f411d Merge "Make plugin and l3plugin available as mixin's properties"
+- f739614 Merge "Return port context from _bind_port_if_needed"
+- ec9435a Merge "MLNX Agent: ensure removed ports get treated on resyncs"
+- c3c9f58 Preserve link local IP allocations for DVR fip ns across restart
+- 338171c Fix 404 error fetching metadata when using DVR
+- 89fb8b6 Raise exception for network delete with subnets presents
+- 71fe4a6 Merge "Add delete operations for the ODL MechanismDriver"
+- 1a1561f Opencontrail plug-in implementation for core resources
+- c353a26 Do not assume order of new_peers list elements
+- 4b3547c Merge "Fixes an issue with FIP re-association"
+- fe49457 Make plugin and l3plugin available as mixin's properties
+- 0e2b280 Merge "MLNX Agent: Process port_update notifications in the main agent loop"
+- 82b5e32 Merge "Implement Midonet Juno Network Api calls"
+- f9c285f add auth token to context
+- 7205ea5 Fixes an issue with FIP re-association
+- 45e8eaa NSX: unify the two distributed routing extensions
+- 0ac15ad NSX: fix wording for configuration option
+- bdf47d1 Merge "Remove duplicated check for router connect to external net"
+- 598e14c MLNX Agent: ensure removed ports get treated on resyncs
+- c1ed203 Add delete operations for the ODL MechanismDriver
+- 18a10fa Merge "ofagent: Upgrade note about firewall_driver"
+- f103ce4 Predictable field and filter ordering
+- 01b2eed Fixing neutron-db-manage with some options other than upgrade/downgrade
+- 8e7120f Merge "Enabled Cisco ML2 driver to use new upstream ncclient"
+- 8be69e1 Removes extra indents from TestSubresourcePlugin
+- 4aaa3de ofagent: Upgrade note about firewall_driver
+- 0392029 Return port context from _bind_port_if_needed
+- 055fff5 Merge "ofagent: Update a comment in port_bound"
+- fa5eb30 MLNX Agent: Process port_update notifications in the main agent loop
+- ec4f861 Merge "Proper validation for inserting firewall rule"
+- b4eaa05 Fix session's InvalidRequestError because of nested rollback
+- 4d92aa0 Merge "ofagent: Remove network_delete method"
+- c5fafcb Remove unneeded device_owner field from l2pop tuple
+- fbf93bf Merge "Fix to throw correct error code for bad attribute"
+- afe9097 ofagent: Remove network_delete method
+- fccb7f7 Merge "ofagent: Add a missing normalized_port_name"
+- ec3f176 Merge "l3_db: refactor L3_NAT_DB_mixin"
+- afbab35 Merge "test_l3_plugin: L3AgentDbInteTestCase L3AgentDbSepTestCase fails"
+- 4979341 Merge "Improve external gateway update handling"
+- 6b8a5f0 Fix to throw correct error code for bad attribute
+- a3022cf Merge "Return 403 instead of 404 on attr policy failures"
+- aedc358 Merge "Do not assume order of pci slot list"
+- 2724b30 Merge "Fix to enable L2pop to serve DVR"
+- 596908f Improve external gateway update handling
+- b0f68bb Do not assume order of pci slot list
+- be81901 DeferredBridge to allow add_tunnel_port passthru
+- cada146 Merge "Move from Python logging to Openstack logging"
+- 74c99fb Enabled Cisco ML2 driver to use new upstream ncclient
+- dc65827 Fix to enable L2pop to serve DVR
+- 03c4dc3 Remove duplicated check for router connect to external net
+- d8c7025 Merge "Simple refactor to stop passing around an unused parameter"
+- de5fa0d ofagent: Add a missing normalized_port_name
+- cfea218 Return 403 instead of 404 on attr policy failures
+- c86b1f7 Proper validation for inserting firewall rule
+- 1d8afc7 Merge "Imported Translations from Transifex"
+- 6087c29 Merge "Fix 500 error during router-update for dvr routers"
+- 8688acd Merge "Make _build_uri_path output predictable"
+- 2c404c3 Imported Translations from Transifex
+- cadc8df Merge "OVS flows apply concurrently using a deferred OVSBridge"
+- ebecca0 Merge "Exit Firewall Agent if config is invalid"
+- f217cc9 Merge "Move Cisco VPN RESTapi URI strings to constants"
+- c5e186f Fix 500 error during router-update for dvr routers
+- d2291d6 Simple refactor to stop passing around an unused parameter
+- ce567d7 Make _build_uri_path output predictable
+- c417c63 Merge "Radware: When a pip is needed, reuse the Port"
+- 1633bc9 Merge "Remove redundant topic from rpc calls"
+- 77bc90c Merge "Big Switch: Only update hash header on success"
+- a576517 Radware: When a pip is needed, reuse the Port
+- 02db851 Merge "ofagent: Stop monitoring ovsdb for port changes"
+- 7021f12 Remove redundant topic from rpc calls
+- 98e65ca Merge "NSX: remove duplicate call to set_auth_cookie()"
+- e9ed3d0 Merge "Do not assume order of network_uuid's"
+- 5ec2f9e Merge "Make sure that gateway is in CIDR range by default"
+- 748f0d5 l3_db: refactor L3_NAT_DB_mixin
+- 990d596 OVS flows apply concurrently using a deferred OVSBridge
+- 6bd6deb Merge "ofagent: Desupport ancillary bridges"
+- eef7938 Merge "Add a tox test environment for random hashseed testing"
+- 31783e2 Do not assume order of network_uuid's
+- 1e7c2c6 Merge "Updated from global requirements"
+- acaa134 Merge "Do not assume order of quotas dictionary elements"
+- b8cf452 Big Switch: Only update hash header on success
+- f151cae ofagent: Stop monitoring ovsdb for port changes
+- 5a63085 ofagent: Desupport ancillary bridges
+- 5db7c77 Add a tox test environment for random hashseed testing
+- 9652d2e OFAgent: Implement arp responder
+- 32630d9 Updated from global requirements
+- 8307be7 Merge "NSX: Correct default timeout params"
+- 5c93dfa Do not assume order of quotas dictionary elements
+- ba87499 Move Cisco VPN RESTapi URI strings to constants
+- a566fb7 Merge "Fix spelling in get_plugin_interface docstring"
+- 7a56aa6 Merge "Fix spelling mistakes"
+- 70f7524 Merge "Imported Translations from Transifex"
+- db053e7 Remove ignored do_request timeout argument
+- a1b17e4 Merge "Fix DB Duplicate error when scheduling distributed routers"
+- 1a0be0e Move from Python logging to Openstack logging
+- a5cdc39 Imported Translations from Transifex
+- 9d677ce Merge "Removed configobj from test requirements"
+- 8a294eb Merge "Remove reference to cisco_cfg_agent.ini from setup.cfg"
+- c162624 Merge "Make ML2 ensure_dvr_port_binding more robust"
+- 87725d2 Merge "centralized router is incorrectly scheduled"
+- 81efeaa NSX: remove duplicate call to set_auth_cookie()
+- 0b7a768 NSX: Correct default timeout params
+- 091f023 Merge "Fix enums usage for postgres in migrations"
+- c669860 Merge "Audited attribute for policy update not changing"
+- 9a08deb Merge "Use correct section for log message if interface_driver import fails"
+- ed02ca5 Merge "Allow unsharing a network used as gateway/floatingip"
+- a71fb34 Remove reference to cisco_cfg_agent.ini from setup.cfg
+- 03e0989 Merge "Fix-DVR Gateway clear doesn't delete csnat port"
+- 3ee8957 Merge "Imported Translations from Transifex"
+- d6f014d Exit Firewall Agent if config is invalid
+- 1cbb3b6 Merge "Use storage engine when creating tables in migrations"
+- e5949d1 Merge "Configuration agent for Cisco devices"
+- 598accd Fix spelling mistakes
+- 0b4e42f Fix DB Duplicate error when scheduling distributed routers
+- 2842a27 Imported Translations from Transifex
+- 0b30651 Make ML2 ensure_dvr_port_binding more robust
+- b844085 centralized router is incorrectly scheduled
+- 86a0ade Fix-DVR Gateway clear doesn't delete csnat port
+- 045a1fc Fix spelling in get_plugin_interface docstring
+- 466e899 Use storage engine when creating tables in migrations
+- 207f1b4 Removed configobj from test requirements
+- 32af49e Implement Midonet Juno Network Api calls
+- f32c0eb Merge "Add missing ml2 plugin to migration 1fcfc149aca4"
+- 4ab8740 Merge "Do not schedule network when creating reserved DHCP port"
+- c6dfda2 Merge "Move ARP responder test to sanity command"
+- 56607c3 Merge "Add L3 Scheduler Changes for Distributed Routers"
+- 596aa4f Merge "Fix ML2 Plugin binding:profile update"
+- 30f1a75 Add missing ml2 plugin to migration 1fcfc149aca4
+- e416a54 Replace nullable from primary keys in tz_network_bindings with default
+- 25c5291 Use correct section for log message if interface_driver import fails
+- 0e44b7b Make sure that gateway is in CIDR range by default
+- 748d4fd test_l3_plugin: L3AgentDbInteTestCase L3AgentDbSepTestCase fails
+- 6a7bf84 Merge "Pass filters in arrays in get_agent_gw_ports_exist_for_network"
+- 461a910 Merge "Bump hacking to version 0.9.2"
+- 0411dc6 Merge "Make dvr_vmarp_table_update call conditional to dvr extension"
+- 0aa6147 Merge "Functional tests work fine with random PYTHONHASHSEED"
+- 8fd406c Merge "Replaced the strings with respective constants"
+- 12f037b Merge "Call config_parse in base test setup"
+- 8582b67 Merge "neutron.conf does not have the definition of firewall quotas"
+- 0b7e565 Add L3 Scheduler Changes for Distributed Routers
+- 5575f3b Merge "Race condition of L3-agent to add/remove routers"
+- 7a72917 Pass filters in arrays in get_agent_gw_ports_exist_for_network
+- a68d2c8 Merge "Check that router info is set before calling _update_arp_entry"
+- 57b97ed Merge "Fix deprecated opt in haproxy driver"
+- a43f74d Merge "Fix wrong order of tables in downgrade"
+- 56c84cd Do not schedule network when creating reserved DHCP port
+- a1d1347 Check that router info is set before calling _update_arp_entry
+- fff5505 Merge "Set nullable=False on tenant_id in apic_contracts table"
+- 43c1f98 Move ARP responder test to sanity command
+- 8417c62 neutron.conf does not have the definition of firewall quotas
+- bd40fbe Fix wrong order of tables in downgrade
+- cd3f4f7 Fix deprecated opt in haproxy driver
+- fbc6b99 Race condition of L3-agent to add/remove routers
+- 7e9fc14 Replaced the strings with respective constants
+- 3eee505 Make dvr_vmarp_table_update call conditional to dvr extension
+- 6b4da14 ofagent: Update a comment in port_bound
+- 30556c4 Merge "ML2 additions to support DVR"
+- bce9d24 Merge "Updated from global requirements"
+- a19e2d3 Merge "Changes to remove the use of mapping tables from Nuage plugin"
+- b31ee88 Updated from global requirements
+- 8820fef Merge "Set promote_secondaries when creating namespaces"
+- aa8cf7b Merge "Make test_l3_agent._prepare_router_data a module function"
+- f5d2602 Merge "Remove redundant code in tests/unit/test_l3_agent"
+- 141a00b Set promote_secondaries when creating namespaces
+- ffe34d3 Merge "Fixed audit notifications for dhcp-agent-network"
+- c83207e Functional tests work fine with random PYTHONHASHSEED
+- d98ca64 Call config_parse in base test setup
+- cd35b19 ML2 additions to support DVR
+- 889382b Make test_l3_agent._prepare_router_data a module function
+- 7657587 Remove redundant code in tests/unit/test_l3_agent
+- b750dce Merge "Cisco: Fix test cases which make incorrect create requests"
+- 409075e Merge "Avoid RequestURITooLong exception in metadata agent"
+- 5721066 Merge "Add definition for new VIF type"
+- cbaa3fe Fix ML2 Plugin binding:profile update
+- 505042d Merge "Set python hash seed to 0 in tox.ini"
+- 82557b8 Set python hash seed to 0 in tox.ini
+- 3f51d94 Merge "VPNaaS: Separate validation for Cisco impl"
+- 01f1508 Merge "Encapsulate some port properties in the PortContext"
+- 75d89c0 Add definition for new VIF type
+- 334aecc Configuration agent for Cisco devices
+- 0be575d Merge "update vsm credential correctly"
+- e7daa81 Merge "VMWare: don't notify on disassociate_floatingips()"
+- 4c22c8c Merge "sync periodic_task fix from incubator"
+- 5a27fdd Merge "Updated from global requirements"
+- 6bd147d Handle bool correctly during _extend_extra_router_dict
+- fdee780 Encapsulate some port properties in the PortContext
+- a2fff6e Merge "Add rule for updating network's router:external attribute"
+- d38194e Merge "ML2 mechanism driver for SR-IOV capable NIC based switching, Part 2"
+- 23fa27d Merge "Log methods using rpc communcation"
+- 49cdd82 Merge "Correct misspelled variable name"
+- 31d67cf Changes to remove the use of mapping tables from Nuage plugin
+- 6fa442b Updated from global requirements
+- 1af7d92 Merge "Move loadbalancer vip port creation outside of transaction"
+- 2abe915 Correct misspelled variable name
+- e85ff22 Avoid RequestURITooLong exception in metadata agent
+- 75735e9 Merge "OFAgent: Share codes of l2-population in OVS agent"
+- 2675091 Move loadbalancer vip port creation outside of transaction
+- baec346 Merge "ML2: Update a comment after the recent bind_port change"
+- 4471b81 Merge "Clear entries in Cisco N1KV specific tables on rollback"
+- ca8d71a Merge "call security_groups_member_updated in port_update"
+- abe8a4c Merge "Modify L3 Agent for Distributed Routers"
+- 3c59f7c Merge "Use method's logger in log decorator"
+- e15100d Merge "Missing max_routes in neutron.conf"
+- 0ea1453 Merge "Return a tuple of None's instead of one None"
+- 940d125 Define some abstract methods in VpnDriver class
+- b4b1db3 ML2 mechanism driver for SR-IOV capable NIC based switching, Part 2
+- 073aa81 Modify L3 Agent for Distributed Routers
+- 900ef2c Audited attribute for policy update not changing
+- 322fa88 OFAgent: Share codes of l2-population in OVS agent
+- dc44496 Add rule for updating network's router:external attribute
+- 6762aca Set nullable=False on tenant_id in apic_contracts table
+- e97eea8 call security_groups_member_updated in port_update
+- 045ae35 ML2: Update a comment after the recent bind_port change
+- c37b243 Fixed audit notifications for dhcp-agent-network
+- 355ff10 Fix enums usage for postgres in migrations
+- a84a8a5 Return a tuple of None's instead of one None
+- e71eda9 VPNaaS: Separate validation for Cisco impl
+- eafebec VMWare: don't notify on disassociate_floatingips()
+- 4f40c8f Bump hacking to version 0.9.2
+- 8a50e13 Log methods using rpc communcation
+- 487b98a update vsm credential correctly
+- 0540847 Use method's logger in log decorator
+- 72f6691 Cisco: Fix test cases which make incorrect create requests
+- 5e80775 Missing max_routes in neutron.conf
+- 73b4239 Clear entries in Cisco N1KV specific tables on rollback
+- 7a2053c Allow unsharing a network used as gateway/floatingip
+- cb06335 sync periodic_task fix from incubator
+
+* Fri Jun 13 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1.1-1
+- Update to upstream 2014.1.1
+- Added previously missing ml2_conf_mlnx.ini, bz#1100136
+
+* Wed Jun 11 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-21
+- Ensure routing key is specified in the address for a direct producer, bz#1108025
+
+* Thu May 29 2014 Miguel Ángel Ajo <majopela@redhat.com> 2014.1-20
+- Add nuage plugin packaging as openstack-neutron-nuage
+
+* Wed May 28 2014 Miguel Angel Ajo <majopela@redhat.com> 2014.1-19
+- Remove kernel version check for OVS VXLAN, not revelant for RDO
+ bz#1081011
+
+* Mon May 19 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-18
+- netaddr<=0.7.10 raises ValueError instead of AddrFormatError, bz#1090137
+
+* Mon May 19 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-17
+- Validate CIDR given as ip-prefix in security-group-rule-create, bz#1090137
+
+* Fri May 16 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-16
+- Fixed neutron-server startup due to duplicate options
+
+* Thu May 15 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-15
+- Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121
+
+* Tue Apr 29 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-14
+- Removed signing_dir from neutron-dist.conf, again (bz#1050842)
+
+* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-13
+- Removed obsolete setup scripts
+
+* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-12
+- Removed signing_dir from neutron.conf
+
+* Tue Apr 22 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-11
+- Pin python-novaclient dependency to >= 2.17.0
+
+* Fri Apr 18 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-10
+- Remove uneeded dep on python-keystone
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-7
+- Require python-novaclient (used for Nova notifications)
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-6
+- We no longer specify notification_driver in neutron-dist.conf
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-5
+- Move api-paste.ini to /usr to make sure new values are applied on upgrade
+
+* Fri Apr 18 2014 Terry Wilson <twilson@redhat.com> - 2014.1-4
+- Rename nicira plugin to vmware
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-3
+- Clean up neutron-dist.conf to reflect identical upstream defaults
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-2
+- Set use_stderr = False to avoid duplicate logging for stderr
+
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-1
+- Update to upstream 2014.1
+
+* Tue Apr 15 2014 Miguel Ángel Ajo <majopela@redhat.com> -2014.1-0.19.rc2
+- Include the systemd readiness notification patch
+
+* Tue Apr 15 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-0.18.rc2
+- Add missing dependency on python-oslo-rootwrap
+
+* Fri Apr 11 2014 Miguel Angel Ajo <mangelajo@redhat.com> 2014.1-0.17.rc2
+- Update to upstream 2014.1.rc2
+
+* Fri Apr 11 2014 Miguel Ángel Ajo <majopela@redhat.com> 2014.1-0.16.rc1
+- Use rabbitmq by default
+
+* Thu Apr 10 2014 Miguel Ángel Ajo <majopela@redhat.com> 2014.1-0.15.rc1
+- Removes the python-pyudev dependency, bz#1053001
+
+* Thu Apr 10 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2014.1-0.14.rc1
+- Remove signing_dir from neutron-dist.conf, bz#1050842
+
+* Fri Apr 04 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-0.13.rc1
+- Fix startup issue due to invalid group permissions, bz#1080560
+- Remove runtime dependency on python-pbr
+
+* Wed Apr 02 2014 Terry Wilson <twilson@redhat.com> 2014.1-0.9.rc1
+- Update to upstream 2014.1.rc1
+- Remove python-psutil requires
+
+* Wed Mar 19 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-8
+- Create agents table when ML2 core_plugin is used
+
+* Tue Mar 11 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-7
+- Fixed a broken dependency/typo lxaml -> lxml
+- Enforcing python-six >= 1.4.1 at least
+
+* Fri Mar 07 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-6
+- Update to icehouse milestone 3
+- Add neutron-dhcp-agent dependency bz#1019487
+- Remove nicira plugin, renamed vmware-nsx to vmware bz#1058995
+- Add openstack-neutron-ibm plugin
+- Add openstack-neutron-ofagent plugin from ryu project
+
+* Tue Feb 04 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1.b2-5
+- Fix missing dependency on python-stevedore
+
+* Tue Feb 04 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1.b2-4
+- Fix exception on systems with dnsmasq < 2.59
+
+* Mon Jan 27 2014 Terry Wilson <twilson@redhat.com> - 2014.1.b2-3
+- Update to icehouse milestone 2
+
+* Tue Jan 07 2014 Terry Wilson <twilson@redhat.com> - 2014.1.b1-2
+- Add python-psutil requirement for openvswitch agent, bz#1049235
+
+* Mon Dec 23 2013 Pádraig Brady <pbrady@redhat.com> - 2014.1.b1-1
+- Update to icehouse milestone 1
+
+* Wed Dec 18 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2.1-1
+- Update to Havana stable release 2013.2.1
+
+* Fri Dec 13 2013 Terry Wilson <twilson@redhat.com> - 2013.2-13
+- QPID fixes from oslo-incubator, bz#1038711, bz#1038717
+- Remove dnsmasq version warning, bz#997961
+- Ensure that disabled services are properly handled on upgrade, bz#1040704
+
+* Mon Dec 09 2013 Terry Wilson <twilson@redhat.com> - 2013.2-12
+- Add vpnaas/fwaas configs to init scripts, bz#1032450
+- Pass neutron rootwrap.conf in sudoers.d/neutron, bz#984097
+
* Wed Dec 04 2013 Terry Wilson <twilson@redhat.com> - 2013.2-11
- Add missing debug and vpnaas rootwrap filters, bz#1034207
--- /dev/null
+#!/bin/bash -x
+exit 0
Code Review / openstack-build / neutron-build.git / commitdiff