lib/boot.rb in forj-1.0.13 vs lib/boot.rb in forj-1.0.14
- old
+ new
@@ -36,11 +36,11 @@
"The syntax `forj boot '%s' on '%s' as '%s'`" \
" is depreciated. \nUse `forj boot '%s' '%s' ",
blueprint, old_accountname, old_name, blueprint, old_name
)
- if account.get('account_name') == old_accountname
+ if account.get(:account_name) == old_accountname
PrcLib.warning('%s` instead.', msg)
else
PrcLib.warning("%s -a '%s'` instead.", msg, old_accountname)
end
name = old_name
@@ -125,11 +125,10 @@
PrcLib.fatal(1, "Account '%s' not loaded. You need to call "\
'`forj setup %s [provider]` to use this account.',
@account[:account_name], @account[:account_name])
end
- options = options.to_h
options['tb_path'] = nil if options.key?('test_box') &&
!options.key?('tb_path')
options_map = { :infra => :infra_repo,
:key_name => :keypair_name,
:key_path => :keypair_path,
@@ -140,10 +139,11 @@
:maestro_repo => :maestro_repo,
:branch => :branch,
:test_box => :test_box,
:tb_path => :test_box_path,
:ca_root_cert => :ca_root_cert,
- :extra_metadata => :extra_metadata }
+ :extra_metadata => :extra_metadata,
+ :webproxy => :webproxy }
load_options(options, options_map) { |k, v| complete_boot_options(k, v) }
validate_keypath(options)