Merge lp:~corey.bryant/neutron/2014.1.1 into lp:~ubuntu-server-dev/neutron/icehouse

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

[lp:~corey.bryant/neutron/2014.1.1]

263. By Corey Bryant on 2014-06-09

* Resynchronize with stable/icehouse (54ac82b) (LP: #1328134):
  - [2b42dd3] Handle errors from run_ofctl() when dumping flows
  - [d00446b] Reprogram flows when ovs-vswitchd restarts
  - [8d3026b] Added missing plugin .ini files to setup.cfg
  - [072bbc0] NEC plugin: Bump L3RPC callback version to 1.1
  - [47a4954] Remove List events API from Cisco N1kv Neutron
  - [28a26db] Install SNAT rules for ipv4 only
  - [5bdea2d] Use os.uname() instead of calling uname in subprocess
  - [48bc7db] Replace loopingcall in notifier with a delayed send
  - [66eeda2] Explicitly import state_path opt in tests.base
  - [f1b0607] NSX: allow net-migration only in combined mode
  - [8abb05c] NSX: do not raise on missing router during migration step
  - [4c945dd] NSX: fix error when creating VM ports on subnets without dhcp
  - [efa4f28] OVS lib defer apply doesn't handle concurrency
  - [bc30b52] NSX: ensure that no LSN is created on external networks
  - [2bcc7bf] NSX: pass the right argument during metadata setup
  - [26a591a] Big Switch: Check source_address attribute exists
  - [74a9365] L3 RPC loop could delete a router on concurrent update
  - [2a7164a] Optimize querying for security groups
  - [bac4389] set api.extensions logging to ERROR in unit tests
  - [d1ab56d] Make default nova_url use a version
  - [2c56e14] NSX: fix API payloads for dhcp/metadata setup
  - [f217479] NSX: fix migration for networks without a subnet
  - [bf281cd] NSX: change api mapping for Service Cluster to Edge Cluster
  - [7225e2b] NSX: add nsx switch lookup to dhcp and metadata operations
  - [b922aa7] Fixed floating IP logic in PLUMgrid plugin
  - [84650f8] IBM: set secret=True on passwd config field
  - [c5040b4] Update ensure()/reconnect() to catch MessagingError
  - [e0deffc] NSX: Fix fake_api_client to raise NotFound
  - [42a8539] netaddr<=0.7.10 raises ValueError instead of AddrFormatError
  - [68a24e5] Validate CIDR given as ip-prefix in security-group-rule-create
  - [8991aa6] gw_port should be set as lazy='join'
  - [54ac82b] NSX: ensure dhcp port is setup on metadata network

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-13 07:37:43 +0000
+++ debian/changelog	2014-06-09 21:04:36 +0000
@@ -1,3 +1,41 @@
+neutron (1:2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (54ac82b) (LP: #1328134):
+    - [2b42dd3] Handle errors from run_ofctl() when dumping flows
+    - [d00446b] Reprogram flows when ovs-vswitchd restarts
+    - [8d3026b] Added missing plugin .ini files to setup.cfg
+    - [072bbc0] NEC plugin: Bump L3RPC callback version to 1.1
+    - [47a4954] Remove List events API from Cisco N1kv Neutron
+    - [28a26db] Install SNAT rules for ipv4 only
+    - [5bdea2d] Use os.uname() instead of calling uname in subprocess
+    - [48bc7db] Replace loopingcall in notifier with a delayed send
+    - [66eeda2] Explicitly import state_path opt in tests.base
+    - [f1b0607] NSX: allow net-migration only in combined mode
+    - [8abb05c] NSX: do not raise on missing router during migration step
+    - [4c945dd] NSX: fix error when creating VM ports on subnets without dhcp
+    - [efa4f28] OVS lib defer apply doesn't handle concurrency
+    - [bc30b52] NSX: ensure that no LSN is created on external networks
+    - [2bcc7bf] NSX: pass the right argument during metadata setup
+    - [26a591a] Big Switch: Check source_address attribute exists
+    - [74a9365] L3 RPC loop could delete a router on concurrent update
+    - [2a7164a] Optimize querying for security groups
+    - [bac4389] set api.extensions logging to ERROR in unit tests
+    - [d1ab56d] Make default nova_url use a version
+    - [2c56e14] NSX: fix API payloads for dhcp/metadata setup
+    - [f217479] NSX: fix migration for networks without a subnet
+    - [bf281cd] NSX: change api mapping for Service Cluster to Edge Cluster
+    - [7225e2b] NSX: add nsx switch lookup to dhcp and metadata operations
+    - [b922aa7] Fixed floating IP logic in PLUMgrid plugin
+    - [84650f8] IBM: set secret=True on passwd config field
+    - [c5040b4] Update ensure()/reconnect() to catch MessagingError
+    - [e0deffc] NSX: Fix fake_api_client to raise NotFound
+    - [42a8539] netaddr<=0.7.10 raises ValueError instead of AddrFormatError
+    - [68a24e5] Validate CIDR given as ip-prefix in security-group-rule-create
+    - [8991aa6] gw_port should be set as lazy='join'
+    - [54ac82b] NSX: ensure dhcp port is setup on metadata network
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 16:18:49 -0400
+
 neutron (1:2014.1-0ubuntu3) utopic; urgency=medium
 
   * Add allow-stderr autopkgtest restriction for the dpkg error spew.