--- a/components/openstack/heat/patches/05-neutron-names-required.patch	Wed Sep 07 14:48:41 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-In-house patch to change the name of Neutron objects to use underscores
-instead of hyphens on Solaris.  This patch has not yet been submitted
-upstream.
-
---- heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py.orig	2015-05-05 11:16:07.369538369 -0600
-+++ heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py	2015-05-05 11:17:11.789570983 -0600
-@@ -13,6 +13,7 @@
- from oslo_utils import uuidutils
- import six
-
-+import platform
- import warnings
-
- from heat.common import exception
-@@ -188,3 +189,10 @@ class NeutronResource(resource.Resource)
-             return True
-
-         return self._not_found_in_call(self._show_resource)
-+
-+    def physical_resource_name(self):
-+        name = super(NeutronResource, self).physical_resource_name()
-+        if platform.uname()[0] == "SunOS":
-+            # EVS can not use hyphen characters
-+            name = name.replace("-", "_")
-+        return name