components/openstack/heat/patches/01-heat-conf.patch
changeset 6850 f8d3bc724af7
parent 6176 8b75bcaa9d4d
equal deleted inserted replaced
6849:f9a2279efa0d 6850:f8d3bc724af7
     1 In-house patch to further adjust Heat's config-generator.conf file to
     1 In-house patch to further adjust Heat's config-generator.conf file to
     2 account for which modules are actually imported for each service.
     2 account for which modules are actually imported for each service.
     3 These changes are have not yet been submitted upstream.
     3 These changes are have not yet been submitted upstream.
     4 
     4 
     5 --- heat-2015.1.2/config-generator.conf.~1~	2015-10-13 09:51:53.000000000 -0700
     5 --- heat-6.0.0/config-generator.conf.orig	2016-04-07 00:37:12.000000000 -0700
     6 +++ heat-2015.1.2/config-generator.conf	2016-03-18 00:35:54.956692584 -0700
     6 +++ heat-6.0.0/config-generator.conf	2016-06-27 17:51:07.216229170 -0700
     7 @@ -1,6 +1,8 @@
     7 @@ -20,3 +20,7 @@ namespace = oslo.policy
     8  [DEFAULT]
     8  namespace = oslo.service.service
     9  output_file = etc/heat/heat.conf.sample
     9  namespace = oslo.service.periodic_task
    10  wrap_width = 79
    10  namespace = oslo.service.sslutils
    11 +namespace = heat.api.aws.ec2token
    11 +namespace = oslo.cache
    12 +namespace = heat.api.middleware.ssl
    12 +namespace = oslo.concurrency
    13  namespace = heat.common.config
    13 +namespace = oslo.reports
    14  namespace = heat.common.crypt
    14 +namespace = oslo.versionedobjects
    15  namespace = heat.common.heat_keystoneclient
       
    16 @@ -10,9 +12,8 @@ namespace = heat.engine.notification
       
    17  namespace = heat.engine.resources
       
    18  namespace = heat.openstack.common.eventlet_backdoor
       
    19  namespace = heat.openstack.common.policy
       
    20 -namespace = heat.api.middleware.ssl
       
    21 -namespace = heat.api.aws.ec2token
       
    22  namespace = keystonemiddleware.auth_token
       
    23 -namespace = oslo.messaging
       
    24  namespace = oslo.db
       
    25  namespace = oslo.log
       
    26 +namespace = oslo.messaging
       
    27 +namespace = oslo.middleware