Merge pull request #352 from mansam/fix-cindermanager-inventory-impor…

…t-path Add StorageManager modules to fix CinderManager import paths
ManageIQ · Sep 13, 2018 · c6b66fa · c6b66fa
2 parents 954a5d0 + a4f1517
commit c6b66fa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/openstack/inventory/collector.rb b/app/models/manageiq/providers/openstack/inventory/collector.rb
@@ -4,7 +4,7 @@ class ManageIQ::Providers::Openstack::Inventory::Collector < ManageIQ::Providers
 
   require_nested :CloudManager
   require_nested :NetworkManager
-  require_nested :CinderManager
+  require_nested :StorageManager
   require_nested :TargetCollection
 
   attr_reader :availability_zones

diff --git a/app/models/manageiq/providers/openstack/inventory/collector/storage_manager.rb b/app/models/manageiq/providers/openstack/inventory/collector/storage_manager.rb
@@ -0,0 +1,3 @@
+module ManageIQ::Providers::Openstack::Inventory::Collector::StorageManager
+  require_nested :CinderManager
+end
diff --git a/app/models/manageiq/providers/openstack/inventory/parser.rb b/app/models/manageiq/providers/openstack/inventory/parser.rb
@@ -1,5 +1,5 @@
 class ManageIQ::Providers::Openstack::Inventory::Parser < ManageIQ::Providers::Inventory::Parser
   require_nested :CloudManager
   require_nested :NetworkManager
-  require_nested :CinderManager
+  require_nested :StorageManager
 end
diff --git a/app/models/manageiq/providers/openstack/inventory/parser/storage_manager.rb b/app/models/manageiq/providers/openstack/inventory/parser/storage_manager.rb
@@ -0,0 +1,3 @@
+module ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager
+  require_nested :CinderManager
+end
diff --git a/app/models/manageiq/providers/openstack/inventory/persister.rb b/app/models/manageiq/providers/openstack/inventory/persister.rb
@@ -1,7 +1,7 @@
 class ManageIQ::Providers::Openstack::Inventory::Persister < ManageIQ::Providers::Inventory::Persister
   require_nested :CloudManager
   require_nested :NetworkManager
-  require_nested :CinderManager
+  require_nested :StorageManager
   require_nested :TargetCollection
 
   # TODO(lsmola) figure out a way to pass collector info, probably via target, then remove the below

diff --git a/app/models/manageiq/providers/openstack/inventory/persister/storage_manager.rb b/app/models/manageiq/providers/openstack/inventory/persister/storage_manager.rb
@@ -0,0 +1,3 @@
+module ManageIQ::Providers::Openstack::Inventory::Persister::StorageManager
+  require_nested :CinderManager
+end