--- a/components/openstack/heat/patches/05-neutron-names-required.patch	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/heat/patches/05-neutron-names-required.patch	Tue Apr 07 13:31:20 2015 -0700
@@ -2,21 +2,20 @@
 instead of hyphens on Solaris.  This patch has not yet been submitted
 upstream.
 
---- heat-2013.2.3/heat/engine/resources/neutron/neutron.py.orig     2014-07-22 18:07:26.583195123 -0600
-+++ heat-2013.2.3/heat/engine/resources/neutron/neutron.py  2014-07-22 18:08:49.115350165 -0600
-@@ -13,6 +13,8 @@
+--- heat-2014.2.2/heat/engine/resources/neutron/neutron.py.orig     2014-07-22 18:07:26.583195123 -0600
++++ heat-2014.2.2/heat/engine/resources/neutron/neutron.py  2014-07-22 18:08:49.115350165 -0600
+@@ -11,6 +11,7 @@
  #    License for the specific language governing permissions and limitations
  #    under the License.
 
 +import platform
-+
- from neutronclient.common.exceptions import NeutronClientException
+ import warnings
 
  from heat.common import exception
-@@ -147,3 +149,10 @@
-                     else:
-                         raise
-         return seclist
+@@ -188,3 +189,10 @@ class NeutronResource(resource.Resource)
+     def check_delete_complete(self, delete_task):
+         # if the resource was already deleted, delete_task will be None
+         return delete_task is None or delete_task.step()
 +
 +    def physical_resource_name(self):
 +        name = super(NeutronResource, self).physical_resource_name()