lib/onceover/beaker/spec_helper.rb in onceover-3.22.0 vs lib/onceover/beaker/spec_helper.rb in onceover-4.0.0

- old
+ new

@@ -33,20 +33,20 @@ # Define persistant default node c.add_setting :default_node, :default => nil #default option values defaults = { - :nodeset => 'onceover-nodes', + :nodeset => 'onceover-nodes', } #read env vars env_vars = { - :color => ENV['BEAKER_color'] || ENV.fetch('RS_COLOR', nil), - :nodeset => ENV['BEAKER_set'] || ENV.fetch('RS_SET', nil), + :color => ENV['BEAKER_color'] || ENV.fetch('RS_COLOR', nil), + :nodeset => ENV['BEAKER_set'] || ENV.fetch('RS_SET', nil), :nodesetfile => ENV['BEAKER_setfile'] || ENV.fetch('RS_SETFILE', nil), - :provision => ENV['BEAKER_provision'] || ENV.fetch('RS_PROVISION', nil), - :keyfile => ENV['BEAKER_keyfile'] || ENV.fetch('RS_KEYFILE', nil), - :debug => ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil), - :destroy => ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil), + :provision => ENV['BEAKER_provision'] || ENV.fetch('RS_PROVISION', nil), + :keyfile => ENV['BEAKER_keyfile'] || ENV.fetch('RS_KEYFILE', nil), + :debug => ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil), + :destroy => ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil), }.compact #combine defaults and env_vars to determine overall options options = defaults.merge(env_vars) # process options to construct beaker command string