|
23 | 23 | } |
24 | 24 | #read env vars |
25 | 25 | env_vars = { |
26 | | - :color => ENV['BEAKER_color'] || ENV['RS_COLOR'], |
27 | | - :nodeset => ENV['BEAKER_set'] || ENV['RS_SET'], |
28 | | - :nodesetdir => ENV['BEAKER_setdir'] || ENV['RS_SETDIR'], |
29 | | - :nodesetfile => ENV['BEAKER_setfile'] || ENV['RS_SETFILE'], |
30 | | - :provision => ENV['BEAKER_provision'] || ENV['RS_PROVISION'], |
31 | | - :keyfile => ENV['BEAKER_keyfile'] || ENV['RS_KEYFILE'], |
32 | | - :debug => ENV['BEAKER_debug'] || ENV['RS_DEBUG'], |
33 | | - :destroy => ENV['BEAKER_destroy'] || ENV['RS_DESTROY'], |
34 | | - :optionsfile => ENV['BEAKER_options_file'] || ENV['RS_OPTIONS_FILE'], |
| 26 | + :color => ENV['BEAKER_COLOR'] || ENV['BEAKER_color'] || ENV['RS_COLOR'], |
| 27 | + :nodeset => ENV['BEAKER_SET'] || ENV['BEAKER_set'] || ENV['RS_SET'], |
| 28 | + :nodesetdir => ENV['BEAKER_SETDIR'] || ENV['BEAKER_setdir'] || ENV['RS_SETDIR'], |
| 29 | + :nodesetfile => ENV['BEAKER_SETFILE'] || ENV['BEAKER_setfile'] || ENV['RS_SETFILE'], |
| 30 | + :provision => ENV['BEAKER_PROVISION'] || ENV['BEAKER_provision'] || ENV['RS_PROVISION'], |
| 31 | + :keyfile => ENV['BEAKER_KEYFILE'] || ENV['BEAKER_keyfile'] || ENV['RS_KEYFILE'], |
| 32 | + :debug => ENV['BEAKER_DEBUG'] || ENV['BEAKER_debug'] || ENV['RS_DEBUG'], |
| 33 | + :destroy => ENV['BEAKER_DESTROY'] || ENV['BEAKER_destroy'] || ENV['RS_DESTROY'], |
| 34 | + :optionsfile => ENV['BEAKER_OPTIONS_FILE'] || ENV['BEAKER_options_file'] || ENV['RS_OPTIONS_FILE'], |
35 | 35 | }.delete_if {|key, value| value.nil?} |
36 | 36 | #combine defaults and env_vars to determine overall options |
37 | 37 | options = defaults.merge(env_vars) |
|
0 commit comments