components/openstack/glance/patches/05-launchpad-1496012.patch
changeset 5405 66fd59fecd68
equal deleted inserted replaced
5404:55e409ba4e72 5405:66fd59fecd68
       
     1 This patch has been integrated into Glance 11.0.0 in Liberty but has
       
     2 not yet been back-ported to Kilo.
       
     3 
       
     4 commit fa30891cf659360207b71d9345666478d4554582
       
     5 Author: Erno Kuvaja <[email protected]>
       
     6 Date:   Tue Sep 15 14:57:29 2015 +0000
       
     7 
       
     8     Update Glance example configs to reflect Liberty
       
     9     
       
    10     Adding taskflow_executor_opts into the opts so they will be included.
       
    11     
       
    12     Closes-bug: #1496012
       
    13     
       
    14     Depends-On: I52ebf810f4699826baa2bdf91d28e24d902cf950
       
    15     Change-Id: I9c0988a70f691482258f5f3ba9a5cf5601a81ddf
       
    16 
       
    17 diff --git a/glance/opts.py b/glance/opts.py
       
    18 index 1542d13..a626a3b 100644
       
    19 --- a/glance/opts.py
       
    20 +++ b/glance/opts.py
       
    21 @@ -25,6 +25,7 @@ import itertools
       
    22  
       
    23  import glance.api.middleware.context
       
    24  import glance.api.versions
       
    25 +import glance.async.taskflow_executor
       
    26  import glance.common.config
       
    27  import glance.common.location_strategy
       
    28  import glance.common.location_strategy.store_type
       
    29 @@ -51,6 +52,7 @@ _api_opts = [
       
    30          glance.common.wsgi.bind_opts,
       
    31          glance.common.wsgi.eventlet_opts,
       
    32          glance.common.wsgi.socket_opts,
       
    33 +        glance.common.wsgi.profiler_opts,
       
    34          glance.image_cache.drivers.sqlite.sqlite_opts,
       
    35          glance.image_cache.image_cache_opts,
       
    36          glance.notifier.notifier_opts,
       
    37 @@ -61,6 +63,8 @@ _api_opts = [
       
    38          glance.scrubber.scrubber_opts))),
       
    39      ('image_format', glance.common.config.image_format_opts),
       
    40      ('task', glance.common.config.task_opts),
       
    41 +    ('taskflow_executor',
       
    42 +     glance.async.taskflow_executor.taskflow_executor_opts),
       
    43      ('store_type_location_strategy',
       
    44       glance.common.location_strategy.store_type.store_type_opts),
       
    45      ('paste_deploy', glance.common.config.paste_deploy_opts)