diff --git a/config/application.rb b/config/application.rb index fd19217169b..9aca2d5c935 100644 --- a/config/application.rb +++ b/config/application.rb @@ -115,7 +115,7 @@ class Application < Rails::Application # Because this is easy to mess up, keep your initializers in order. # register plugins even before loading settings, as plugins can bring their own settings initializer :register_vmdb_plugins, :before => :load_vmdb_settings do - Vmdb::Plugins.instance.register_from_railties + Vmdb::Plugins.instance.register_vmdb_plugins end initializer :load_vmdb_settings, :before => :load_config_initializers do diff --git a/lib/vmdb/plugins.rb b/lib/vmdb/plugins.rb index 07088ea9e7c..2a4be2caab0 100644 --- a/lib/vmdb/plugins.rb +++ b/lib/vmdb/plugins.rb @@ -11,10 +11,10 @@ def initialize end def vmdb_plugins - @vmdb_plugins.empty? ? register_from_railties : @vmdb_plugins + @vmdb_plugins.empty? ? register_vmdb_plugins : @vmdb_plugins end - def register_from_railties + def register_vmdb_plugins Rails.application.railties.each do |railtie| next unless railtie.class.name.start_with?("ManageIQ::Providers::") || railtie.try(:vmdb_plugin?) register_vmdb_plugin(railtie)