--- a/components/openstack/heat/patches/01-heat-conf.patch	Wed Sep 07 14:48:41 2016 -0700
+++ b/components/openstack/heat/patches/01-heat-conf.patch	Wed Sep 07 14:48:41 2016 -0700
@@ -2,26 +2,13 @@
 account for which modules are actually imported for each service.
 These changes are have not yet been submitted upstream.
 
---- heat-2015.1.2/config-generator.conf.~1~	2015-10-13 09:51:53.000000000 -0700
-+++ heat-2015.1.2/config-generator.conf	2016-03-18 00:35:54.956692584 -0700
-@@ -1,6 +1,8 @@
- [DEFAULT]
- output_file = etc/heat/heat.conf.sample
- wrap_width = 79
-+namespace = heat.api.aws.ec2token
-+namespace = heat.api.middleware.ssl
- namespace = heat.common.config
- namespace = heat.common.crypt
- namespace = heat.common.heat_keystoneclient
-@@ -10,9 +12,8 @@ namespace = heat.engine.notification
- namespace = heat.engine.resources
- namespace = heat.openstack.common.eventlet_backdoor
- namespace = heat.openstack.common.policy
--namespace = heat.api.middleware.ssl
--namespace = heat.api.aws.ec2token
- namespace = keystonemiddleware.auth_token
--namespace = oslo.messaging
- namespace = oslo.db
- namespace = oslo.log
-+namespace = oslo.messaging
-+namespace = oslo.middleware
+--- heat-6.0.0/config-generator.conf.orig	2016-04-07 00:37:12.000000000 -0700
++++ heat-6.0.0/config-generator.conf	2016-06-27 17:51:07.216229170 -0700
+@@ -20,3 +20,7 @@ namespace = oslo.policy
+ namespace = oslo.service.service
+ namespace = oslo.service.periodic_task
+ namespace = oslo.service.sslutils
++namespace = oslo.cache
++namespace = oslo.concurrency
++namespace = oslo.reports
++namespace = oslo.versionedobjects