Hello community,
here is the log from the commit of package openstack-neutron for
openSUSE:Factory checked in at 2014-04-14 10:56:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-neutron (Old)
and /work/SRC/openSUSE:Factory/.openstack-neutron.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-neutron"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron-doc.changes
2013-10-02 08:51:41.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron-doc.changes
2014-04-14 10:56:15.000000000 +0200
@@ -1,0 +2,275 @@
+Fri Mar 7 10:41:12 UTC 2014 - speili...@suse.com
+
+- Update to version neutron-2014.1.dev36.g005fec6:
+ * One Convergence Neutron Plugin Implementation
+ * NEC plugin: delete old OFC ID mapping tables
+ * Imported Translations from Transifex
+ * Fix typo in migration script
+ * BigSwitch: Add SSL Certificate Validation
+ * BigSwitch: Auto re-sync on backend inconsistencies
+ 2014.1.b3
+ * Add OpenDaylight ML2 MechanismDriver
+ * Replaces network:* strings by constants
+ * NSX: passing wrong security_group id mapping to nsx backend
+ * ovs-agent: use hexadecimal IP address in tunnel port name
+ * Fix DetachedInstanceError for Agent instance
+
+-------------------------------------------------------------------
+Thu Mar 6 06:17:35 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev458.g17698d6:
+ * Adds the missing migration for gw_ext_mode
+ * VPNaaS Service Driver for Cisco CSR
+ * Updated from global requirements
+ * Do fip_status migration only for l3-capable plugins
+ * Fix race condition in update_floatingip_statuses
+ * Implementaion of Mechanism driver for Brocade VDX cluster of switches
+ * Avoid unnecessarily checking the existence of a device
+ * Refactor netns.execute so that it is not necessary to check namespace
+ * Minor refactoring for Hyper-V utils and tests
+ * Adds Hyper-V Security Groups implementation
+ * Adds multiple RPC worker processes to neutron server
+ * NEC plugin: PFC packet fitler support
+ * Remove unused method update_fixed_ip_lease_expiration
+ * NSX: make sync backend run more often
+ * Use database session from the context in N1kv plugin
+ * ML2 mechanism driver access to binding details
+ * Reset the policy after loading extensions
+ * L3 agent fetches the external network id once
+
+-------------------------------------------------------------------
+Wed Mar 5 00:46:28 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev422.g9c47fa1:
+ * Rename migration lb_stats_needs_bigint to match revision number
+ * Imported Translations from Transifex
+ * Different class names for VPNaaS migrations
+ * ML2: database needs to be initalized after drivers loaded
+ * replace rest of q_exc to n_exc in code base
+ * Fix NVP/Nicira nits
+ * Embrane Plugin fails alembic migrations
+ * Implement Mellanox ML2 MechanismDriver
+ * Remove unused 'as e' in exception blocks
+ * Improves Arista's ML2 driver's sync performance
+ * Remove pyudev dependency
+ * Fix class name typo in test_db_rpc_base
+
+-------------------------------------------------------------------
+Tue Mar 4 00:55:59 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev398.g78366ad:
+ * Remove nvplib and move utility methods into nsxlib
+ * BigSwitch: Add address pair support to plugin
+ * Support advanced NVP IPsec VPN Service
+ * Fix NVP FWaaS errors when creating firewall without policy
+ * Avoid using "raise" to reraise with modified exception
+ * BigSwitch: Stop using external locks
+ * Make sure dnsmasq can distinguish IPv6 address from MAC address
+ * Move db migration of ml2 security groups to havana
+
+-------------------------------------------------------------------
+Mon Mar 3 11:44:05 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev383.ge99f84c:
+ * Remove vim line from db migartion template
+ * Imported Translations from Transifex
+ * Implement OpenFlow Agent mechanism driver
+ * Log configuration values for OVS agent
+ * BigSwitch: Asynchronous rest calls for port create
+ * Openvswitch update_port should return updated port info
+ * Change tenant network type usage for IB Fabric
+
+-------------------------------------------------------------------
+Mon Mar 3 01:25:15 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev369.g4e4c894:
+ * Remove call to addCleanup(cfg.CONF.reset)
+ * nec plugin: Avoid long transaction in delete_ports
+ * Imported Translations from Transifex
+ * Finish off rebranding of the Nicira NVP plugin
+ * Introduce status for floating IPs
+ * BigSwitch: Add agent to support neutron sec groups
+ * Adds the new IBM SDN-VE plugin
+ * Imported Translations from Transifex
+ * Nuage Networks Plugin
+ * Fixes spelling error Closes-Bug: #1284257
+ * Updated from global requirements
+ * Change firewall to DOWN when admin state down
+ * NSX: add missing space 'routeron'
+ * Imported Translations from Transifex
+ * Update License Headers to replace Nicira with VMware
+ * Renaming plugin-specific exceptions to match NSX
+ * Imported Translations from Transifex
+ * DB Mappings for NSX security groups
+ * NSX: port status must reflect fabric, not link status
+ * Typo/grammar fixes for the example neutron config file
+ * NSX: Pass NSX uuid when plugging l2 gw attachment
+ * stats table needs columns to be bigint
+ * Remove import extension dep from db migration
+ * Fix get_vif_port_by_id to only return relevant ports
+ * Fix NSX migration path
+ * Add user-supplied arguments in log_handler
+ * Imported Translations from Transifex
+ * NSX: Fix newly created port's status should be DOWN
+ * Rename/refactoring of NVP api client to NSX
+ * Rename DB models and related resources for VMware NSX plugin
+
+-------------------------------------------------------------------
+Mon Feb 24 01:31:22 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev253.g07a467d:
+ * Updated from global requirements
+ * Imported Translations from Transifex
+ * Raise max header size to accommodate large tokens
+ * NSX: get_port_status passed wrong id for network
+ * remove pointless test TestN1kvNonDbTest
+ * Use "!=" instead of "is not" when comparing two values
+ * ML2/vxlan/test: remove unnecessary self.addCleanup(cfg.CONF.reset)
+ * Adds https support for metadata agent
+ * wsgi.run_server no longer used
+ * Implements an LBaaS driver for NetScaler devices
+ * Improve unit test coverage for Cisco plugin model code
+ * ipt_mgr.ipv6 written in the wrong ipt_mgr.ipv4
+ * Update help message of flag 'enable_isolated_metadata'
+ * Fix invalid facilities documented in rootwrap.conf
+ * Remove dependent module py3kcompat
+ * Use six.StringIO/BytesIO instead of StringIO.StringIO
+ * remove unused imports
+ * Ensure that session is rolled back on bulk creates
+ * add router_id to response for CRU on fw/vip objs
+ * Sync latest oslo.db code into neutron
+ * Extending quota support for neutron LBaaS entities
+
+-------------------------------------------------------------------
+Sun Feb 23 00:52:28 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev211.gbd55a52:
+ * Reset API naming scheme for VMware NSX plugin
+ * Rename Security Groups related methods for VMware NSX plugin
+ * Rename L2 Switch/Gateway related methods for VMware NSX plugin
+ * Rename Router related methods for VMware NSX plugin
+ * Plugins should call __init__ of db_base_plugin for db.configure
+ * Fixes broken documentation hyperlinks
+ * Imported Translations from Transifex
+ * Add support to request vnic type on port
+ * Fix typo in service_drivers.ipsec
+ * Add additional unit tests for the ML2 plugin
+ * Don't document non-existing flag '--hide-elapsed'
+ * Removes an incorrect and unnecessary return
+ * L3 Agent restart causes network outage
+
+-------------------------------------------------------------------
+Sat Feb 22 01:23:51 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev186.g4d72fe0:
+ * Imported Translations from Transifex
+ * Don't require passing in port_security=False if security_groups present
+ * Use different context for each API request in unit tests
+ * Sync minimum requirements
+ * Copy cache package from oslo-incubator
+ * BigSwitch: Move config and REST to diff modules
+ * tests/unit: Initialize core plugin in TestL3GwModeMixin
+ * Fix request timeout errors during calls to NSX controller
+ * Fix ValueError in ip_lib.IpRouteCommand.get_gateway()
+ * LBaaS: move agent based driver files into a separate dir
+ * Refactor to remove _recycle_ip
+
+-------------------------------------------------------------------
+Fri Feb 21 01:49:12 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev165.g9f1bdec:
+ * vshield task manager: abort tasks in stop() on termination
+ * Revert "Skip a test for nicira service plugin"
+ * Validate rule uuids provided for update_policy
+ * Add update from agent to plugin on device up
+ * Parse JSON in ovs_lib.get_vif_port_by_id
+
+-------------------------------------------------------------------
+Thu Feb 20 01:40:30 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev155.gf0182a1:
+ * Imported Translations from Transifex
+ * Remove unused RPC calls from n1kv plugin code
+
+-------------------------------------------------------------------
+Wed Feb 19 01:13:00 UTC 2014 - cloud-de...@suse.de
+
+- Update to version neutron-2014.1.dev151.g7fb2d57:
++++ 78 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron-doc.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron-doc.changes
--- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes
2014-01-23 15:50:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes
2014-04-14 10:56:16.000000000 +0200
@@ -2 +2,575 @@
-Thu Jan 16 10:01:19 UTC 2014 - bwiedem...@suse.com
+Wed Apr 9 17:01:40 UTC 2014 - dmuel...@suse.com
+
+- update to 2014.1.rc2:
+ * no real changes
+
+-------------------------------------------------------------------
+Tue Apr 8 11:48:27 UTC 2014 - dmuel...@suse.com
+
+- add 0001-Start-ping-listener-also-for-postgresql.patch
+- Switch over to Icehouse branch
+
+-------------------------------------------------------------------
+Tue Apr 1 13:41:07 UTC 2014 - speili...@suse.com
+
+- Update to version 2014.1.rc1:
+ * BigSwitch: Semaphore on port status update
+ * Add Icehouse no-op migration
+ * Imported Translations from Transifex
+ * Invoke _process_l3_create within plugin session
+ * Add missing parameters for port creation
+ * Cancelling thread start while unit tests running
+ * Delete duplicate external devices in router namespace
+ * UT: do not hide an original error in test resource ctxtmgr
+ * BigSwitch: Move attr ref after error check
+ * Fix namespace exist() method
+ * Make dnsmasq aware of all names
+ * Prevent cross plugging router ports from other tenants
+ * Adds OVS_HYBRID_PLUG flag to portbindings
+ * Disable XML tests on Py26
+ * Subnets should be set as lazy='join'
+ * nec plugin: allow to delete resource with ERROR status
+ * Synced rpc and gettextutils modules from oslo-incubator
+ * Import request_id middleware bug fix from oslo
+ * Migrate data from cap_port_filter to vif_details
+ * Imported Translations from Transifex
+ * Include cisco plugin in migration plugins with ovs
+ * ML2 Cisco Nexus MD: Remove workaround for bug 1276395
+ * Replace a usage of the deprecated root_helper option
+ * Add script to migrate ovs or lb db to ml2 db
+ * Correct OVS VXLAN version check
+ * LBaaS: make device driver decide whether to deploy instance
+ * Imported Translations from Transifex
+ * Remove extra space in help string
+ * Add enable_security_group to BigSwitch and OneConvergence ini files
+ * Add nec plugin to allowed address pairs migration
+ * Imported Translations from Transifex
+ * Fix segment allocation tables in Cisco N1kv plugin
+ * Updated from global requirements
+ * NEC plugin: Rename quantum_id column to neutron_id
+ * Log received pool.status
+ * NEC plugin: Allow to add prefix to OFC REST URL
+ * NEC plugin: Remove a colon from binding:profile key due to XML problem
+ * rename ACTIVE_PENDING to ACTIVE_PENDING_STATUSES
+ * VPNaaS support for VPN service admin state change and reporting
+ * Use save_and_reraise_exception when reraise exception
+ * Return meaningful error message on pool creation error
+ * Don't set priority when calling mod_flow
+ * Avoid creating FixedIntervalLoopingCall in agent UT
+ * Imported Translations from Transifex
+ * Big Switch Plugin: No REST port delete on net del
+ * Add enable_security_group option
+ * Get rid of additional db contention on fetching VIP
+ * Fix typo in lbaas agent exception message
+ * ML2: Remove validate_port_binding() and unbind_port()
+ * Imported Translations from Transifex
+ * Fix duplicate name of NVP LBaaS objs not allowed on vShield Edge
+ * tests/unit: clean up notification driver
+ * Add a semaphore to some ML2 operations
+ * Log dnsmasq host file generation
+ * add HEAD sentinel file that contains migration revision
+ * Added config value help text in ns metadata proxy
+ * Fix usage of save_and_reraise_exception
+ * Cisco VPN device driver post-merge cleanup
+ * Fixes the Hyper-V agent individual ports metrics
+ * Sync excutils from oslo
+ * BigSwitch ML2: Include bound_segment in port
+ * NEC plugin: Honor Retry-After response from OFC
+ * Add update binding:profile with physical_network
+ * return false or true according to binding result
+ * Enable to select an RPC handling plugin under Metaplugin
+ * Ensure to count firewalls in target tenant
+ * Mock agent RPC for FWaaS tests to delete DB objs
+ * Allow CIDRs with non-zero masked portions
+ * Cisco plugin fails with ParseError no elem found
+ * Cisco Nexus: maximum recursion error in ConnectionContext.__del__
+ * Don't use root to list namespaces
+ * Fixes Hyper-V agent security groups enable issue
+ * ML2 BigSwitch: Don't modify parent context
+ * LBaaS: small cleanup in agent device driver interface
+ * Change report_interval from 4 to 30, agent_down_time from 9 to 75
+ * Stop removing ip allocations on port delete
+ * Imported Translations from Transifex
+ * Ignore PortNotFound exceptions on lockless delete
+ * Show neutron API request body with debug enabled
+ * Add session persistence support for NVP advanced LBaaS
+ * Fix misleading error message about failed dhcp notifications
+ * NSX: Fix router-interface-delete returns 404 when router not in nsx
+ * BigSwitch: Watchdog thread start after servers
+ * Calculate stateless IPv6 address
+ * Create new IPv6 attributes for Subnets
+ * Remove individual cfg.CONF.resets from tests
+ * BigSwitch: Sync workaround for port del deadlock
+ * NSX: Ensure gateway devices are usable after upgrade
+ * Process ICMP type for iptables firewall
+ * Imported Translations from Transifex
+ * Added missing l3_update call in update_network
+ * ML2 plugin involves in agent_scheduler migration
+ * Imported Translations from Transifex
+ * Avoid long transaction in plugin.delete_ports()
+ * cisco: Do not change supported_extension_aliases directly
+ * Fix KeyError except on router_info in FW Agent
+ * NSX: remove last of unneed quantum references
+ * NSX: fix intermetting UT failure on vshield test_router_create
+ * Bugfix and refactoring for ovs_lib flow methods
+ * Send fdb remove message when a port is migrated
+ * Imported Translations from Transifex
+ * Send network-changed notifications to nova
+ * Notify nova when ports are ready
+ * Skip radware failing test for now
+ * NSX: Propagate name updates for security profiles
+ * Fix in admin_state_up check function
+ * NSX: lower the severity of messages about VIF's on external networks
+ * Kill 'Skipping unknown group key: firewall_driver' log trace
+ * Imported Translations from Transifex
+ * API layer documentation
+ * BigSwitch: Use eventlet.sleep in watchdog
+ * Embrane LBaaS Driver
+ * BigSwitch: Widen range of HTTPExceptions caught
+ * Fix ml2 & nec plugins for allowedaddresspairs tests
+ * Fix unittest failure in radware lbaas driver
+ * Removes calls to mock.patch.stopall in unit tests
+ * Stop mock patches by default in base test class
+ * Query for port before calling l3plugin.disassociate_floatingips()
+ * Optimize floating IP status update
+ * NSX: Allow multiple references to same gw device
+ * VPNaaS Device Driver for Cisco CSR
+ * Updated from global requirements
+ * BigSwitch: Fix certificate file helper functions
+ * Create agents table when ML2 core_plugin is used
+ * Fix usage of sqlalchemy type Integer
+ * Fixing lost vlan ids on interfaces
+ * Fix bug:range() is not same in py3.x and py2.x
+ * Call target plugin out of DB transaction in the Metaplugin
+ * NSX: Sync do not pass around model object
+ * NSX: Make replication mode configurable
+ * Updated from global requirements
+ * Fix ml2 db migration of subnetroutes table
+ * Imported Translations from Transifex
+ * After bulk create send DHCP notification
+ * Fix lack of extended port's attributes in Metaplugin
+ * Add missing ondelete option to Cisco N1kv tables
+ * Migration support for Mellanox Neutron plugin
+ * Imported Translations from Transifex
+ * Imported Translations from Transifex
+ * Updated from global requirements
+ * Add support for tenant-provided NSX gateways devices
+ * NSX: fix nonsensical log trace on update port
+ * BigSwitch: Fix rest call in consistency watchdog
+ * BigSwitch: Fix cfg.Error format in exception
+ * BigSwitch: Fix error for server config check
+ * Fixed Spelling error in Readme
+ * Adds state reporting to SDN-VE agent
+ * Fix unittest failure in radware lbaas driver
+ * NSX: Add ability to retry on 503's returned by the controller
+ * Cisco Neutron plugin fails DB migration
+ * Floatingip_status migration not including Embrane's plugin
+ * One Convergence Neutron Plugin l3 ext support
+ * Nuage plugin was missed in floatingip_status db migration script
+ * ML2 Cisco Nexus MD: VM migration support
+ * Drop old nvp extension file
+ * Makes the Extension loader behavior predictable
+ * One Convergence Neutron Plugin Implementation
+ * NEC plugin: delete old OFC ID mapping tables
+ * Imported Translations from Transifex
+ * Fix typo in migration script
+ * Enhance GET networks performance of metaplugin
+ * Adds the missing migration for gw_ext_mode
+ * BigSwitch: Add SSL Certificate Validation
+ * BigSwitch: Auto re-sync on backend inconsistencies
+ * VPNaaS Service Driver for Cisco CSR
+- New sub-package nvsd-agent for the One Convergence NVSD Controller
+ pluging agent. The plugin is still part of the base package (same
+ as with most other plugins)
+
+-------------------------------------------------------------------
+Tue Mar 25 12:16:55 UTC 2014 - dmuel...@suse.com
+
+- fix agent/plugin config ordering
+
+-------------------------------------------------------------------
+Mon Mar 17 10:40:59 UTC 2014 - rha...@suse.com
+
+- switch over to non-openstack-prefix'ed users
+
+------------------------------------------------------------------
+Fri Mar 7 10:41:16 UTC 2014 - speili...@suse.com
++++ 1091 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes
Old:
----
0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch
neutron-stable-havana.tar.gz
New:
----
0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch
0001-Start-ping-listener-also-for-postgresql.patch
neutron-2014.1.rc2.tar.gz
openstack-neutron.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-neutron-doc.spec ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -19,13 +19,13 @@
%define component neutron
Name: openstack-neutron-doc
-Version: 2013.2.2.dev15.g5bbc2f0
+Version: 2014.1.rc2
Release: 0
Summary: OpenStack Virtual Network Service (Neutron) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: https://launchpad.net/neutron
-Source: neutron-stable-havana.tar.gz
+Source: http://tarballs.openstack.org/neutron/neutron-%{version}.tar.gz
BuildRequires: openstack-suse-macros
BuildRequires: python-Paste
BuildRequires: python-PasteDeploy
@@ -37,7 +37,6 @@
BuildRequires: python-alembic
BuildRequires: python-configobj
BuildRequires: python-devel
-BuildRequires: python-distribute
BuildRequires: python-eventlet
BuildRequires: python-extras
BuildRequires: python-iso8601
@@ -49,6 +48,7 @@
BuildRequires: python-neutronclient
BuildRequires: python-nose
BuildRequires: python-pyudev
+BuildRequires: python-setuptools
BuildRequires: python-unittest2
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,7 +59,7 @@
This package contains documentation files for openstack-%{component}
%prep
-%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0
+%setup -q -n %{component}-%{version}
%openstack_cleanup_prep
%build
++++++ openstack-neutron.spec ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -17,33 +17,35 @@
%define component neutron
-%define groupname openstack-%{component}
-%define username openstack-%{component}
+%define groupname %{component}
+%define username %{component}
Name: openstack-neutron
-Version: 2013.2.2.dev15.g5bbc2f0
+Version: 2014.1.rc2
Release: 0
Summary: OpenStack Network
License: Apache-2.0
Group: System/Management
Url: https://launchpad.net/neutron
-Source: neutron-stable-havana.tar.gz
+Source: http://tarballs.openstack.org/neutron/neutron-%{version}.tar.gz
Source1: openstack-%{component}.init
Source2: %{name}.logrotate
Source3: neutron-sudoers
Source4: openstack-%{component}-plugin.init
Source5: sysconfig.neutron
Source6: openstack-%{component}-ovs-cleanup.init
-# PATCH-FIX-UPSTREAM: Reassign IP to vlan interface when deleting a VLAN bridge
-# https://launchpad.net/bugs/1255153
-Patch1: 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch
+%if 0%{?suse_version} > 1230
+Source10: %name.conf
+BuildRequires: systemd
+%endif
+Patch1: 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch
+Patch2: 0001-Start-ping-listener-also-for-postgresql.patch
BuildRequires: crudini
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: openstack-suse-sudo
BuildRequires: python-devel
BuildRequires: python-pbr
-BuildRequires: python-setuptools
# Documentation build requirements:
BuildRequires: python-Sphinx
Requires: logrotate
@@ -88,20 +90,20 @@
Requires: python-anyjson >= 0.3.3
Requires: python-eventlet >= 0.13.0
Requires: python-greenlet >= 0.3.2
-Requires: python-httplib2
-Requires: python-iso8601 >= 0.1.8
+Requires: python-httplib2 >= 0.7.5
+Requires: python-iso8601 >= 0.1.9
Requires: python-jsonrpclib
-Requires: python-keystoneclient >= 0.3.2
+Requires: python-keystoneclient >= 0.7.0
Requires: python-kombu >= 2.4.8
-Requires: python-netaddr
-Requires: python-neutronclient >= 2.3.0
-Requires: python-novaclient >= 2.15.0
+Requires: python-netaddr >= 0.7.6
+Requires: python-neutronclient >= 2.3.4
+Requires: python-novaclient >= 2.17.0
Requires: python-oslo.config >= 1.2.0
-Requires: python-pbr >= 0.5.21
-Requires: python-pyudev
+Requires: python-oslo.rootwrap
+Requires: python-pbr >= 0.6
Requires: python-requests >= 1.1
-Requires: python-six >= 1.4.1
-Requires: python-stevedore >= 0.10
+Requires: python-six >= 1.5.2
+Requires: python-stevedore >= 0.14
Provides: python-quantum = 2013.2.0
Obsoletes: python-quantum < 2013.2.0
@@ -157,6 +159,7 @@
Summary: OpenStack Network - Load Balancing Agent
Group: Development/Languages/Python
PreReq: %name = %version
+Requires: haproxy
Provides: openstack-quantum-lbaas-agent = 2013.2.0
Obsoletes: openstack-quantum-lbaas-agent < 2013.2.0
@@ -185,6 +188,14 @@
%description metadata-agent
This package provides the Meta Data Agent.
+%package restproxy-agent
+Summary: OpenStack Network - REST Proxy Agent
+Group: Development/Languages/Python
+PreReq: %name = %version
+
+%description restproxy-agent
+This package provides the REST Proxy Agent.
+
%package metering-agent
Summary: OpenStack Network - Metering Agent
Group: Development/Languages/Python
@@ -203,6 +214,27 @@
%description mlnx-agent
This package provides the Mellanox Agent
+%package vmware-agent
+Summary: OpenStack Network - Nicira Plugin
+Group: Development/Languages/Python
+PreReq: %name = %version
+Requires: openvswitch-switch
+Provides: openstack-quantum-vmware-agent = 2014.1.0
+Obsoletes: openstack-quantum-vmware-agent < 2014.1.0
+
+%description vmware-agent
+This package contains the OpenStack Network plugin that implements virtual
+networks using Nicira NVP.
+
+%package ibm-agent
+Summary: OpenStack Network - IBM Agent
+Group: Development/Languages/Python
+PreReq: %name = %version
+Provides: openstack-neutron-agent = %version
+
+%description ibm-agent
+This package provides the IBM Agent.
+
%package nec-agent
Summary: OpenStack Network - NEC Agent
Group: Development/Languages/Python
@@ -230,41 +262,37 @@
Group: Development/Languages/Python
Provides: openstack-neutron-agent = %version
PreReq: %name = %version
-Requires: openvswitch
+Requires: openvswitch-switch
Provides: openstack-quantum-openvswitch-agent = 2013.2.0
Obsoletes: openstack-quantum-openvswitch-agent < 2013.2.0
%description openvswitch-agent
This package provides the OpenVSwitch Agent.
-%package vmware-agent
-Summary: OpenStack Network - VMWare NSX
-Group: Development/Languages/Python
-Provides: openstack-neutron-agent = %version
-PreReq: %name = %version
-Requires: openvswitch
-Provides: openstack-quantum-vmware-agent = 2013.2.0
-Obsoletes: openstack-quantum-vmware-agent < 2013.2.0
-
-%description vmware-agent
-This package contains the OpenStack Network plugin that implements virtual
-networks using Nicira NVP.
-
%package vpn-agent
Summary: OpenStack Network - VPN Agent
Group: Development/Languages/Python
PreReq: %name = %version
+Requires: strongswan
%description vpn-agent
This package provides the VPN Agent.
+%package nvsd-agent
+Summary: OpenStack Network - One Convergence NVSD Agent
+Group: Development/Languages/Python
+PreReq: %name = %version
+
+%description nvsd-agent
+This package provides the One Convergence NVSD Agent.
+
%package plugin-cisco
Summary: OpenStack Network - Cisco Plugin (openvswitch based)
Group: Development/Languages/Python
Provides: openstack-neuton-plugin-cisco = %version
PreReq: %name = %version
PreReq: %name-server = %version
-Requires: openvswitch
+Requires: openvswitch-switch
Requires: python >= 2.6.8
Requires: python-configobj
Requires: python-ncclient
@@ -279,20 +307,14 @@
Requires: python-WebTest >= 2.0
Requires: python-cliff >= 1.4.3
Requires: python-configobj
-Requires: python-coverage >= 3.6
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
Requires: python-discover
%endif
Requires: python-fixtures >= 0.3.14
-Requires: python-flake8 >= 2.0
-Requires: python-hacking >= 0.5.6
Requires: python-mock >= 1.0
-Requires: python-mox >= 0.5.3
-Requires: python-pep8 >= 1.4.5
-Requires: python-pyflakes >= 0.7.2
-Requires: python-python-subunit
-Requires: python-testrepository >= 0.0.17
-Requires: python-testtools >= 0.9.32
+Requires: python-python-subunit >= 0.0.18
+Requires: python-testrepository >= 0.0.18
+Requires: python-testtools >= 0.9.34
Provides: openstack-quantum-test = 2013.2.0
Obsoletes: openstack-quantum-test < 2013.2.0
@@ -301,10 +323,10 @@
of OpenStack Neutron.
%prep
-%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0
+%setup -q -n %{component}-%{version}
%patch1 -p1
-## comment me in
-# %xopenstack_cleanup_prep
+%patch2
+%openstack_cleanup_prep
%build
python setup.py build
@@ -314,12 +336,16 @@
python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
--install-data=/
### directories
-install -d -m 755 %{buildroot}%{_localstatedir}/run/%{component}
-install -d -m 755 %{buildroot}%{_localstatedir}/log/%{component}
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{component}
+install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component}
+install -d -m 750 %{buildroot}%{_localstatedir}/cache/%{component}
+install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component}
+%if 0%{?suse_version} > 1230
+install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf
+%endif
### configuration files
# all needed files are installed automatically
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{component}
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
### init scripts
@@ -335,11 +361,13 @@
hyperv-agent \
openvswitch-agent \
linuxbridge-agent \
- vmware-agent \
metadata-agent \
+ restproxy-agent \
metering-agent \
+ vmware-agent \
mlnx-agent \
vpn-agent \
+ nvsd-agent
)
agentPaths=(
/etc/%{component}/l3_agent.ini \
@@ -348,11 +376,13 @@
/etc/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini \
/etc/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini \
/etc/%{component}/plugins/linuxbridge/linuxbridge_conf.ini \
- /etc/%{component}/plugins/nicira/nvp.ini \
/etc/%{component}/metadata_agent.ini \
+ /etc/%{component}/plugins/ml2/restproxy.ini \
/etc/%{component}/metering_agent.ini \
+ /etc/%{component}/plugins/vmware/nsx.ini \
/etc/%{component}/plugins/mlnx-agent.ini \
/etc/%{component}/vpn_agent.ini \
+ /etc/%{component}/plugins/oneconvergence/nvsdplugin.ini
)
for i in ${!agents[@]} ; do
@@ -377,17 +407,24 @@
install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1
## SUSE configuration defaults
-crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT verbose True
-crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT core_plugin
neutron.plugins.ml2.plugin.Ml2Plugin
-crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT service_plugins
neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
-crudini --set %{buildroot}/etc/neutron/neutron.conf agent root_helper "sudo
neutron-rootwrap /etc/neutron/rootwrap.conf"
-crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT log_dir
/var/log/neutron
-crudini --set %{buildroot}/etc/neutron/dhcp_agent.ini DEFAULT interface_driver
neutron.agent.linux.interface.BridgeInterfaceDriver
+%define neutron_conf %{buildroot}/etc/neutron/neutron.conf
+%define plugin_dir %{buildroot}/etc/neutron/plugins/
+crudini --set %{neutron_conf} DEFAULT verbose True
+crudini --set %{neutron_conf} DEFAULT core_plugin
neutron.plugins.ml2.plugin.Ml2Plugin
+crudini --set %{neutron_conf} DEFAULT service_plugins
"neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,
neutron.services.loadbalancer.plugin.LoadBalancerPlugin,
neutron.services.vpn.plugin.VPNDriverPlugin"
+crudini --set %{neutron_conf} DEFAULT state_path /var/lib/neutron
+crudini --set %{neutron_conf} agent root_helper "sudo neutron-rootwrap
/etc/neutron/rootwrap.conf"
+crudini --set %{neutron_conf} DEFAULT log_dir /var/log/neutron
+crudini --set %{neutron_conf} DEFAULT lock_path /var/run/%component
+crudini --set %{neutron_conf} keystone_authtoken signing_dir
/var/cache/%component/keystone-signing
+for i in dhcp_agent.ini l3_agent.ini lbaas_agent.ini; do
+ crudini --set %{buildroot}/etc/neutron/$i DEFAULT interface_driver
neutron.agent.linux.interface.BridgeInterfaceDriver
+done
crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT
external_network_bridge "br-ex"
crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT
external_network_bridge ""
-crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT interface_driver
neutron.agent.linux.interface.BridgeInterfaceDriver
-crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini ml2
mechanism_drivers linuxbridge
-crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini securitygroup
firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
+crudini --set %plugin_dir/ml2/ml2_conf.ini ml2 mechanism_drivers linuxbridge
+crudini --set %plugin_dir/ml2/ml2_conf.ini securitygroup firewall_driver
neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
+crudini --set %plugin_dir/linuxbridge/linuxbridge_conf.ini securitygroup
firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
### test subpackage
%openstack_test_package_install
@@ -395,7 +432,7 @@
#TODO/FIXME: there's an upstream discussion on how to install these,
# it's related to setuptools_git / MANIFEST.in issues.
-for i in neutron/tests/unit/nicira/etc/* \
+for i in \
neutron/tests/etc/rootwrap.d/neutron.test.filters \
neutron/tests/etc/api-paste.ini.test \
neutron/tests/etc/neutron.conf.test ; do
@@ -415,9 +452,7 @@
mkdir -p %{buildroot}%{_localstatedir}/cache/%{component}
%pre
-getent group %{groupname} > /dev/null || groupadd -r %{groupname}
-getent passwd %{username} > /dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/neutron -s /sbin/nologin -c "Openstack Neutron Daemons"
%{username}
-exit 0
+%openstack_pre_user_group_create %{username} %{groupname}
%post server
%{fillup_and_insserv -f openstack-%{component}}
@@ -441,37 +476,43 @@
%config(noreplace) %{_sysconfdir}/%{component}/api-paste.ini
%config %{_sysconfdir}/%{component}/policy.json
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/neutron.conf
-%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/fwaas_driver.ini
%config %{_sysconfdir}/%{component}/rootwrap.conf
%dir %{_sysconfdir}/%{component}/rootwrap.d/
-%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/%{component}
-%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component}
-%dir %attr(0755, %{username}, %{groupname})
%{_localstatedir}/cache/%{component}
-%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
+%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component}
+%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
+%dir %attr(0750, %{username}, %{groupname})
%{_localstatedir}/cache/%{component}
+%if 0%{?suse_version} > 1230
+%ghost %dir %attr(700,%{username},%{groupname})
%{_localstatedir}/run/%{component}
+%_tmpfilesdir/%name.conf
+%else
+%dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component}
+%endif
%dir %{_sysconfdir}/%{component}/plugins
%dir %{_sysconfdir}/%{component}/plugins/bigswitch/
%dir %{_sysconfdir}/%{component}/plugins/brocade/
%dir %{_sysconfdir}/%{component}/plugins/hyperv/
%dir %{_sysconfdir}/%{component}/plugins/metaplugin/
-%dir %{_sysconfdir}/%{component}/plugins/midonet
-%dir %{_sysconfdir}/%{component}/plugins/ml2
-%dir %{_sysconfdir}/%{component}/plugins/nec/
+%dir %{_sysconfdir}/%{component}/plugins/midonet/
+%dir %{_sysconfdir}/%{component}/plugins/ml2/
+%dir %{_sysconfdir}/%{component}/plugins/oneconvergence/
%dir %{_sysconfdir}/%{component}/plugins/plumgrid/
-%dir %{_sysconfdir}/%{component}/plugins/ryu/
+%{_sysconfdir}/%{component}/plugins/bigswitch/README
%config(noreplace) %{_sysconfdir}/%{component}/plugins/bigswitch/restproxy.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/linuxbridge/linuxbridge_conf.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/metaplugin/metaplugin.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/midonet/midonet.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_arista.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_brocade.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_cisco.ini
-%config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini
-%config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini
-%config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_odl.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_ofa.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/restproxy.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini
-%config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini
-%config %{_sysconfdir}/%{component}/rootwrap.d/debug.filters
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini
+%config(noreplace) %{_sysconfdir}/%{component}/fwaas_driver.ini
%config %{_sysconfdir}/%{component}/rootwrap.d/iptables-firewall.filters
%{_bindir}/%{component}-debug
%{_bindir}/quantum-debug
@@ -536,6 +577,13 @@
%{_initddir}/openstack-%{component}-metadata-agent
%{_sbindir}/rcopenstack-%{component}-metadata-agent
+%files restproxy-agent
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/%{component}-restproxy-agent
+%{_initddir}/openstack-%{component}-restproxy-agent
+%{_sbindir}/rcopenstack-%{component}-restproxy-agent
+
%files metering-agent
%defattr(-,root,root,-)
%doc LICENSE
@@ -554,19 +602,46 @@
%{_initddir}/openstack-%{component}-mlnx-agent
%{_sbindir}/rcopenstack-%{component}-mlnx-agent
+%files vmware-agent
+%defattr(-,root,root,-)
+%doc LICENSE
+%dir %{_sysconfdir}/%{component}/plugins/vmware/
+%dir %{_sysconfdir}/%{component}/plugins/nicira/
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/vmware/nsx.ini
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini
+%{_bindir}/quantum-check-nvp-config
+%{_bindir}/neutron-nsx-manage
+%{_bindir}/%{component}-check-nvp-config
+%{_bindir}/%{component}-check-nsx-config
+%{_initddir}/openstack-%{component}-vmware-agent
+%{_sbindir}/rcopenstack-%{component}-vmware-agent
+
+%files ibm-agent
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/%{component}-ibm-agent
+%{_bindir}/quantum-ibm-agent
+%dir %{_sysconfdir}/%{component}/plugins/ibm/
+%config(noreplace)
%{_sysconfdir}/%{component}/plugins/ibm/sdnve_neutron_plugin.ini
+
%files nec-agent
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/%{component}/rootwrap.d/nec-plugin.filters
%{_bindir}/%{component}-nec-agent
%{_bindir}/quantum-nec-agent
+%dir %{_sysconfdir}/%{component}/plugins/nec/
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini
%files ryu-agent
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/%{component}/rootwrap.d/ryu-plugin.filters
%{_bindir}/%{component}-ryu-agent
+%{_bindir}/%{component}-ofagent-agent
%{_bindir}/quantum-ryu-agent
+%dir %{_sysconfdir}/%{component}/plugins/ryu/
+%config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini
%files linuxbridge-agent
%defattr(-,root,root,-)
@@ -592,16 +667,6 @@
%{_initddir}/openstack-%{component}-openvswitch-agent
%{_sbindir}/rcopenstack-%{component}-openvswitch-agent
-%files vmware-agent
-%defattr(-,root,root,-)
-%doc LICENSE
-%dir %{_sysconfdir}/%{component}/plugins/nicira/
-%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini
-%{_initddir}/openstack-%{component}-vmware-agent
-%{_sbindir}/rcopenstack-%{component}-vmware-agent
-%{_bindir}/%{component}-check-nvp-config
-%{_bindir}/quantum-check-nvp-config
-
%files vpn-agent
%defattr(-,root,root,-)
%doc LICENSE
@@ -611,6 +676,15 @@
%{_sbindir}/rcopenstack-%{component}-vpn-agent
%config %{_sysconfdir}/%{component}/rootwrap.d/vpnaas.filters
+%files nvsd-agent
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/neutron-nvsd-agent
+%{_bindir}/quantum-nvsd-agent
+%{_initddir}/openstack-%{component}-nvsd-agent
+%{_sbindir}/rcopenstack-%{component}-nvsd-agent
+%config(noreplace)
%{_sysconfdir}/%{component}/plugins/oneconvergence/nvsdplugin.ini
+
%files server
%defattr(-,root,root,-)
%doc LICENSE
@@ -639,5 +713,6 @@
%defattr(-,root,root)
%{python_sitelib}/%{component}/tests/
%{_localstatedir}/lib/%{name}-test/
+%config %{_sysconfdir}/%{component}/rootwrap.d/debug.filters
%changelog
++++++ 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch ++++++
>From a3e05bc83c9be019e0756e33f082291eb2a93079 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <d...@dmllr.de>
Date: Fri, 10 Jan 2014 17:47:57 +0100
Subject: [PATCH] Only enable IP6Tables managing if IPv6 is available
There is no point in trying to set up ip6tables when
ipv6 support has been disabled (for whatever policy reason)
Change-Id: Iff4b9d5d7376b272e4a3bf7a19b4cfaa9579de9b
Closes-Bug: #1203611
---
neutron/agent/linux/iptables_manager.py | 2 +-
neutron/agent/linux/utils.py | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
Index: neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/iptables_manager.py
===================================================================
--- neutron-2014.1.dev369.g4e4c894.orig/neutron/agent/linux/iptables_manager.py
+++ neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/iptables_manager.py
@@ -279,7 +279,7 @@ class IptablesManager(object):
else:
self.execute = linux_utils.execute
- self.use_ipv6 = use_ipv6
+ self.use_ipv6 = use_ipv6 and linux_utils.is_ipv6_supported()
self.root_helper = root_helper
self.namespace = namespace
self.iptables_apply_deferred = False
Index: neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/utils.py
===================================================================
--- neutron-2014.1.dev369.g4e4c894.orig/neutron/agent/linux/utils.py
+++ neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/utils.py
@@ -17,11 +17,13 @@
#
# @author: Juliano Martinez, Locaweb.
+import errno
import fcntl
import os
import shlex
import socket
import struct
+import sys
import tempfile
from eventlet.green import subprocess
@@ -111,6 +113,29 @@ def replace_file(file_name, data):
os.rename(tmp_file.name, file_name)
+def is_ipv6_supported():
+ has_ipv6_support = socket.has_ipv6
+ try:
+ s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+ s.close()
+ except socket.error as e:
+ if e.errno == errno.EAFNOSUPPORT:
+ has_ipv6_support = False
+ else:
+ raise
+
+ # check if there is at least one interface with ipv6
+ if has_ipv6_support and sys.platform.startswith('linux'):
+ try:
+ with open('/proc/net/if_inet6') as f:
+ if not f.read():
+ has_ipv6_support = False
+ except IOError:
+ has_ipv6_support = False
+
+ return has_ipv6_support
+
+
def find_child_pids(pid):
"""Retrieve a list of the pids of child processes of the given pid."""
++++++ 0001-Start-ping-listener-also-for-postgresql.patch ++++++
Index: neutron/openstack/common/db/sqlalchemy/session.py
===================================================================
--- neutron/openstack/common/db/sqlalchemy/session.py.orig
+++ neutron/openstack/common/db/sqlalchemy/session.py
@@ -670,7 +670,7 @@ def _thread_yield(dbapi_con, con_record)
def _ping_listener(engine, dbapi_conn, connection_rec, connection_proxy):
- """Ensures that MySQL and DB2 connections are alive.
+ """Ensures that MySQL, PostgreSQL or DB2 connections are alive.
Borrowed from:
http://groups.google.com/group/sqlalchemy/msg/a4ce563d802c929f
@@ -686,6 +686,15 @@ def _ping_listener(engine, dbapi_conn, c
if engine.dialect.is_disconnect(ex, dbapi_conn, cursor):
msg = _('Database server has gone away: %s') % ex
LOG.warning(msg)
+
+ # if the database server has gone away, all connections in the pool
+ # have become invalid and we can safely close all of them here,
+ # rather than waste time on checking of every single connection
+ engine.dispose()
+
+ # this will be handled by SQLAlchemy and will force it to create
+ # a new connection and retry the original action
+
raise sqla_exc.DisconnectionError(msg)
else:
raise
@@ -768,7 +777,7 @@ def create_engine(sql_connection, sqlite
sqlalchemy.event.listen(engine, 'checkin', _thread_yield)
- if engine.name in ['mysql', 'ibm_db_sa']:
+ if engine.name in ('ibm_db_sa', 'mysql', 'postgresql'):
callback = functools.partial(_ping_listener, engine)
sqlalchemy.event.listen(engine, 'checkout', callback)
if engine.name == 'mysql':
++++++ _service ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -1,7 +1,13 @@
<services>
- <service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/neutron/neutron-stable-havana.tar.gz</param>
- <param name="email">opensuse-cl...@opensuse.org</param>
- <param name="plain-version">True</param>
+ <service mode="disabled" name="download_files">
+ <param name="changesgenerate">enable</param>
+ </service>
+ <service mode="disabled" name="set_version">
+ <param name="basename">neutron</param>
+ </service>
+ <service mode="disabled" name="python_requires">
+ </service>
+ <service name="refresh_patches" mode="disabled">
+ <param name="changesgenerate">enable</param>
</service>
</services>
++++++ neutron-sudoers ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -1,2 +1,2 @@
-Defaults:openstack-neutron !syslog
-openstack-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
/etc/neutron/rootwrap.conf *
+Defaults:neutron !syslog
+neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
/etc/neutron/rootwrap.conf *
++++++ openstack-neutron-ovs-cleanup.init ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -12,7 +12,7 @@
### END INIT INFO
NEUTRON_LOGFILE="/var/log/neutron/ovs-cleanup.log"
-USER="openstack-neutron"
+USER="neutron"
DAEMON=/usr/bin/neutron-ovs-cleanup
DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf
--config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
DAEMON_DIR=/var/run
++++++ openstack-neutron-plugin.init ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -12,14 +12,14 @@
### END INIT INFO
DAEMON="__NAME__"
-USER="openstack-neutron"
+USER="neutron"
CONFFILE="/etc/neutron/neutron.conf"
RUNDIR="/var/run/neutron"
NEUTRON_PLUGIN_CONF="__PLUGIN_CONFFILE__"
NEUTRON_PLUGIN_ARGS=""
if [ ! -z $NEUTRON_PLUGIN_CONF ] && [ $NEUTRON_PLUGIN_CONF != "" ] ; then
- PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file $NEUTRON_PLUGIN_CONF"
+ PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file=$NEUTRON_PLUGIN_CONF"
fi
@@ -31,7 +31,7 @@
case "$1" in
start)
echo -n "Starting neutron-$DAEMON"
- /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON --config-file
$CONFFILE $PLUGIN_ARGS
+ /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON
--config-file=$CONFFILE $PLUGIN_ARGS
rc_status -v
;;
stop)
++++++ openstack-neutron.conf ++++++
d /var/run/openstack-neutron 0700 neutron neutron -
++++++ openstack-neutron.init ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200
@@ -20,7 +20,7 @@
for i in $NEUTRON_PLUGIN_CONF; do
CONF_ARGS="$CONF_ARGS --config-file $i"
done
-USER="openstack-neutron"
+USER="neutron"
DAEMON=/usr/bin/neutron-server
DAEMON_ARGS="--log-file $NEUTRON_LOGFILE $CONF_ARGS"
DAEMON_DIR=/var/run
@@ -36,7 +36,7 @@
case "$1" in
start)
echo -n "Checking for DB Migrations"
- /usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf
--config-file $NEUTRON_PLUGIN_CONF check_migration
+ /usr/bin/neutron-db-manage $CONF_ARGS check_migration
rc_status -v
echo -n "Starting neutron server"
++++++ openstack-neutron.logrotate ++++++
--- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:17.000000000 +0200
+++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:17.000000000 +0200
@@ -1,10 +1,10 @@
-/var/log/quantum/*.log {
+/var/log/neutron/*.log {
rotate 15
size 1M
weekly
dateext
missingok
notifempty
- su openstack-quantum openstack-quantum
+ su neutron neutron
sharedscripts
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
