Address config incompatibility introduced with oslo.config >= 1.2.0

This patch changes how nvp cluster specific configuration is retrieved
from nvp.ini so that it no longer relies on _cparser, which has been
removed in newer versions of oslo.config.

Fixes bug #1200609

Change-Id: I631c6584ca6b45d0f716533bd1d711d049c6f157
Bump stable/grizzly next version to 2013.1.4

Change-Id: I817767bcb618edf94363aa34dd0eb6ce897ce141
Merge "Address config incompatibility introduced with oslo.config >= 1.2.0" into stable/grizzly
Cisco plugin (grizzly) device connection errors

This commit fixes the Cisco plugin device connections issue where the plugin would drop
connections to the Nexus switches.

Change-Id: I9f09d22cb359b4fcdae5f5063a97011d82daf5a1
Fixes: Bug 1212834
Adds default route to DHCP namespace for upstream name resolution.

Any time the DHCP server is updated this code will maintain a default
route in the DHCP namespace using the gateway_ip attribute of the
first DHCP-enabled IPV4 subnet in the list of subnets where gateway_ip
is not None.  This strategy uses the same gateway ip that the DHCP
server hands to the VMs on the network.

Fixes: Bug #1181378

Conflicts:

	quantum/agent/dhcp_agent.py

Change-Id: I0807550a848e1b610c7775d215643ad9c83629ed
(cherry picked from commit 5dd0cf15463e181b92c8809c2dcc7603bb156a0e)
Cisco plugin (grizzly) does not pass proper args.

Fixes bug 1213147

The Cisco plugin in grizzly does not pass proper arguments to
the enable_vlan_on_trunk_int() method in cisco_nexus_network_driver_v2.
The definition calls for 4 arguments (not counting self):

    def enable_vlan_on_trunk_int(self, mgr, nexus_switch,
                                 interface, vlanid)

but the call in the nexus driver passes only 3 arguments:

    self._client.enable_vlan_on_trunk_int(man,
                                          port_id,
                                          vlan_id)

Change-Id: Ie51affe692151a2ac92f22450e2e70b1005f3507
Merge "Cisco plugin (grizzly) device connection errors" into stable/grizzly
Merge "Cisco plugin (grizzly) does not pass proper args." into stable/grizzly
Use elevated context as intended

Rectoring introduced in Id8f81419fbbc3616e216e4da0c16898757905933
was not quite complete, and it missed to change the context needed
to create and destroy the metadata network.

Fix bug #1216110

Change-Id: I2161b07f5cd09654f714e237cb4277e8bc60fff1
Merge "Use elevated context as intended" into stable/grizzly
Nicira plugin: always fetch lports from correct lswitch

Bug 1188652

Remove get_logical_port_status which required a lswitch uuid, and
replace it with a call to query_lswitch_ports, which does not
require it.

Change-Id: I6c7d0403f37b2c9fb4332a8d34dcaa9050ced3fc
Fixes Hyper-V agent unsopported network_type issue

Fixes an issue when an exception is raised in case of not supported
network types.

Fixes bug: #1224583

Change-Id: I847aa825fbf5b7086c9960c051014cc1d7515f62
Merge "Fixes Hyper-V agent unsopported network_type issue" into stable/grizzly
Neutron network delete fails with brocade plugin

(Cherry picked from master + resolved conflicts)

Fixes bug: 1223747

Change-Id: I4a8235d4dcb0c14477835afafd0b5459ce6b01f6
Multiple Neutron operations using script fails on Brocade Plugin

Fixes bug: 1223754

Change-Id: I5c0f99d5261f6a3c1e86fc77536c1237cc7815b7
Merge "Neutron network delete fails with brocade plugin" into stable/grizzly
NEC plugin: Fix nec-agent unexpected exit due to RPC exception

Changes nec-agent to catch RPC exceptions in the main
daemon loop. It fixes the following two bugs.

- nec-agent dies with RPC timeout in secgroup RPC
  (Closes-Bug: #1235106)

- port_added message can be dropped when RPC timeout occurs
  (Closes-Bug: #1235111). Moves exception catch from PluginApi
  to the main daemon loop.

test_nec_agent.py is added during Havana.
The base class and related tests are imported.

Change-Id: I12394b739fc35bff271543f4625c5e3152e534ae
(cherry picked from commit 3df505e448d38929c20721b22d81e47bf917af6a)
Make Quantum NVP plugin future-versions friendly

This patch enables the plugin to deal correctly with
newer versions of the NVP platform; this is done by
allowing the plugin to fall back to the closest known
version of the NVP platform. This is acceptable behavior
as L2/L3 operations implemented by the platform are most
certainly backward compatible.

This patch also improves test coverage for this part of the
code, which is critical to the correct behavior of the plugin.

Fixes bug #1217479

Conflicts:

	neutron/tests/unit/nicira/test_nvplib.py
	quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py

Change-Id: Idddad8b0a5a1709683611bac6f239b18f90ee99b
Merge "NEC plugin: Fix nec-agent unexpected exit due to RPC exception" into stable/grizzly
use parallel installed versions in RHEL6

of webob sqlalchemy python-routes and paste-deploy

Change-Id: I290f56eae61c87893639a9e5d29f7fff760452cf