Merge pull request #14962 from hsong-rh/remove_cindermanager_eventcat…

…cher Remove the Eventcatcher from CinderManager
ManageIQ · Aug 18, 2017 · e928b59 · e928b59
2 parents dc082ae + 772bdc2
commit e928b59
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 53 deletions.
diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager.rb b/app/models/manageiq/providers/storage_manager/cinder_manager.rb
@@ -2,8 +2,6 @@
 #
 
 class ManageIQ::Providers::StorageManager::CinderManager < ManageIQ::Providers::StorageManager
-  require_nested :EventCatcher
-  require_nested :EventParser
   require_nested :RefreshParser
   require_nested :RefreshWorker
   require_nested :Refresher
@@ -65,8 +63,4 @@ def supports_security_protocol?
   def supports_provider_id?
     true
   end
-
-  def self.event_monitor_class
-    ManageIQ::Providers::StorageManager::CinderManager::EventCatcher
-  end
 end
diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager/event_catcher.rb b/app/models/manageiq/providers/storage_manager/cinder_manager/event_catcher.rb
diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager/event_catcher/runner.rb b/app/models/manageiq/providers/storage_manager/cinder_manager/event_catcher/runner.rb
diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager/event_parser.rb b/app/models/manageiq/providers/storage_manager/cinder_manager/event_parser.rb
diff --git a/lib/workers/miq_worker_types.rb b/lib/workers/miq_worker_types.rb
@@ -48,7 +48,6 @@
   "ManageIQ::Providers::Redhat::InfraManager::EventCatcher"                   => %i(manageiq_default),
   "ManageIQ::Providers::Redhat::InfraManager::MetricsCollectorWorker"         => %i(manageiq_default),
   "ManageIQ::Providers::Redhat::InfraManager::RefreshWorker"                  => %i(manageiq_default),
-  "ManageIQ::Providers::StorageManager::CinderManager::EventCatcher"          => %i(manageiq_default),
   "ManageIQ::Providers::StorageManager::CinderManager::RefreshWorker"         => %i(manageiq_default),
   "ManageIQ::Providers::StorageManager::SwiftManager::RefreshWorker"          => %i(manageiq_default),
   "ManageIQ::Providers::Vmware::CloudManager::EventCatcher"                   => %i(manageiq_default),
@@ -129,7 +128,6 @@
   ManageIQ::Providers::Openstack::CloudManager::EventCatcher
   ManageIQ::Providers::Openstack::NetworkManager::EventCatcher
   ManageIQ::Providers::Openstack::InfraManager::EventCatcher
-  ManageIQ::Providers::StorageManager::CinderManager::EventCatcher
   ManageIQ::Providers::Amazon::CloudManager::EventCatcher
   ManageIQ::Providers::Azure::CloudManager::EventCatcher
   ManageIQ::Providers::AnsibleTower::AutomationManager::EventCatcher