Merge branch 'features' into qa

This commit is contained in:
amartynov 2015-10-29 13:31:14 +03:00
commit 9b1ee779ee

View File

@ -32,10 +32,10 @@ module Provider
["ec2", "openstack", "static"].each do |p| ["ec2", "openstack", "static"].each do |p|
begin begin
o = Provider.const_get(p.capitalize).new(conf) o = Provider.const_get(p.capitalize).new(conf)
#if o.configured? if o.configured?
@@providers[p] = o @@providers[p] = o
puts "Provider '#{p}' has been loaded" puts "Provider '#{p}' has been loaded"
#end end
factory = Provider.const_get(p.capitalize + "AccountsFactory").new factory = Provider.const_get(p.capitalize + "AccountsFactory").new
factory.init(conf) factory.init(conf)
@@providers_with_accounts_factories[p] = factory @@providers_with_accounts_factories[p] = factory