components/openstack/ironic/patches/04-generate_sample.patch
changeset 6855 ea44e7e0ca98
parent 5446 27d201e3362b
equal deleted inserted replaced
6854:52081f923019 6855:ea44e7e0ca98
     1 In-house patch to update the generate_sample script and related data
     1 In-house patch to update the generate_sample script and related data
     2 files for use with Solaris.
     2 files for use with Solaris.
     3 
     3 
     4 --- ironic-2015.1.2/tools/config/generate_sample.sh.orig	2015-10-13 10:53:40.000000000 -0700
     4 --- ironic-5.1.2/tools/config/generate_sample.sh.~1~	2016-06-21 12:57:28.000000000 -0700
     5 +++ ironic-2015.1.2/tools/config/generate_sample.sh	2016-02-01 21:01:28.356560160 -0800
     5 +++ ironic-5.1.2/tools/config/generate_sample.sh	2016-07-19 14:17:02.813964380 -0700
     6 @@ -1,5 +1,7 @@
     6 @@ -1,5 +1,7 @@
     7  #!/usr/bin/env bash
     7  #!/usr/bin/env bash
     8  
     8  
     9 +PATH=/usr/gnu/bin:/usr/bin
     9 +PATH=/usr/gnu/bin:/usr/bin
    10 +
    10 +
    11  # Generate sample configuration for your project.
    11  # Generate sample configuration for your project.
    12  #
    12  #
    13  # Aside from the command line flags, it also respects a config file which
    13  # Aside from the command line flags, it also respects a config file which
       
    14 --- ironic-5.1.2/tools/config/oslo.config.generator.rc.~1~	2016-06-21 12:57:28.000000000 -0700
       
    15 +++ ironic-5.1.2/tools/config/oslo.config.generator.rc	2016-07-19 14:27:38.284860215 -0700
       
    16 @@ -1,2 +1,15 @@
       
    17 -export IRONIC_CONFIG_GENERATOR_EXTRA_LIBRARIES='oslo.db oslo.messaging oslo.middleware.cors keystonemiddleware.auth_token oslo.concurrency oslo.policy oslo.log oslo.service.service oslo.service.periodic_task oslo.service.sslutils'
       
    18 +export IRONIC_CONFIG_GENERATOR_EXTRA_LIBRARIES='
       
    19 +    oslo.db
       
    20 +    oslo.messaging
       
    21 +    oslo.middleware
       
    22 +    keystonemiddleware.auth_token
       
    23 +    oslo.concurrency
       
    24 +    oslo.policy
       
    25 +    oslo.log
       
    26 +    oslo.service.service
       
    27 +    oslo.service.periodic_task
       
    28 +    oslo.service.sslutils
       
    29 +    oslo.service.wsgi
       
    30 +    oslo.versionedobjects
       
    31 +'
       
    32  export IRONIC_CONFIG_GENERATOR_EXTRA_MODULES='ironic_lib.disk_utils ironic_lib.disk_partitioner ironic_lib.utils'