1 In-house patch to update the generate_sample script and related data

     2 files for use with Solaris.

     3 

     4 --- nova-2015.1.2/nova/openstack/common/config/generator.py.~1~	2015-10-13 07:52:44.000000000 -0700

     5 +++ nova-2015.1.2/nova/openstack/common/config/generator.py	2016-01-31 21:59:34.000000000 -0800

     6 @@ -104,7 +104,7 @@ def generate(argv):

     7      # and the list of Opt instances for that group.

     8      if parsed_args.libraries:

     9          loader = stevedore.named.NamedExtensionManager(

    10 -            'oslo_config.opts',

    11 +            'oslo.config.opts',

    12              names=list(set(parsed_args.libraries)),

    13              invoke_on_load=False,

    14              on_load_failure_callback=raise_extension_exception

    15 --- nova-2015.1.2/tools/config/generate_sample.sh.~1~	2015-10-13 07:52:44.000000000 -0700

    16 +++ nova-2015.1.2/tools/config/generate_sample.sh	2016-01-31 21:59:34.000000000 -0800

    17 @@ -1,5 +1,7 @@

    18  #!/usr/bin/env bash

    19  

    20 +PATH=/usr/gnu/bin:/usr/bin

    21 +

    22  print_hint() {

    23      echo "Try \`${0##*/} --help' for more information." >&2

    24  }

    25 --- nova-2015.1.2/tools/config/oslo.config.generator.rc.~1~	2015-10-13 07:52:44.000000000 -0700

    26 +++ nova-2015.1.2/tools/config/oslo.config.generator.rc	2016-01-31 22:09:12.591859883 -0800

    27 @@ -1,2 +1,9 @@

    28 -NOVA_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo_db oslo.concurrency"

    29 -NOVA_CONFIG_GENERATOR_EXTRA_MODULES=keystonemiddleware.auth_token

    30 +NOVA_CONFIG_GENERATOR_EXTRA_LIBRARIES=" \

    31 +    keystonemiddleware.auth_token \

    32 +    oslo.concurrency \

    33 +    oslo.db \

    34 +    oslo.db.concurrency \

    35 +    oslo.log \

    36 +    oslo.messaging \

    37 +    oslo.middleware \

    38 +"