Merge pull request #14209 from Ladas/proper_parent_initialization

Proper parent initialization
ManageIQ · Mar 7, 2017 · 0b5e558 · 0b5e558
2 parents 72ca853 + 9265a8b
commit 0b5e558
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/models/manageiq/providers/ansible_tower/shared/inventory/persister/automation_manager.rb b/app/models/manageiq/providers/ansible_tower/shared/inventory/persister/automation_manager.rb
@@ -9,6 +9,6 @@ module ManageIQ::Providers::AnsibleTower::Shared::Inventory::Persister::Automati
     has_automation_manager_configuration_script_payloads :model_class => ManageIQ::Providers::Inflector.provider_module(self)::AutomationManager::Playbook
     has_automation_manager_configured_systems
     has_automation_manager_inventory_root_groups
-    has_vms :arel => Vm, :strategy => :local_db_find_references
+    has_vms :parent => nil, :arel => Vm, :strategy => :local_db_find_references
   end
 end
diff --git a/app/models/manager_refresh/inventory/persister.rb b/app/models/manager_refresh/inventory/persister.rb
@@ -20,9 +20,7 @@ def self.has_inventory(options)
       collections[name] ||= begin
         collection_options = options.dup
 
-        unless collection_options[:strategy] == :local_db_find_references
-          collection_options[:parent] ||= manager
-        end
+        collection_options[:parent] = manager unless collection_options.key?(:parent)
 
         if collection_options[:builder_params]
           collection_options[:builder_params] = collection_options[:builder_params].transform_values do |value|