Merge babdd06 into 7550098

ManageIQ · Aug 28, 2018 · e6662e6 · e6662e6
2 parents 7550098 + babdd06
commit e6662e6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/base_manager/refresher.rb b/app/models/manageiq/providers/base_manager/refresher.rb
@@ -132,6 +132,8 @@ def collect_inventory_for_targets(ems, targets)
         # override this method and return an array of:
         #   [[target1, inventory_for_target1], [target2, inventory_for_target2]]
 
+        return [[ems, nil]] unless refresher_options.inventory_object_refresh
+
         provider_module = ManageIQ::Providers::Inflector.provider_module(ems.class).name
 
         targets_to_collectors = targets.each_with_object({}) do |target, memo|

diff --git a/app/models/manageiq/providers/inventory/persister/builder/infra_manager.rb b/app/models/manageiq/providers/inventory/persister/builder/infra_manager.rb
@@ -50,7 +50,7 @@ def host_system_services
 
         def snapshots
           add_properties(
-            :manager_ref                  => %i(uid),
+            :manager_ref                  => %i(vm_or_template uid),
             :parent_inventory_collections => %i(vms miq_templates),
           )
         end
@@ -214,7 +214,14 @@ def switches
 
         def lans
           add_properties(
-            :manager_ref                  => %i(uid_ems),
+            :manager_ref                  => %i(switch uid_ems),
+            :parent_inventory_collections => %i(hosts),
+          )
+        end
+
+        def subnets
+          add_properties(
+            :manager_ref                  => %i(lan ems_ref),
             :parent_inventory_collections => %i(hosts),
           )
         end

diff --git a/config/settings.yml b/config/settings.yml
@@ -158,8 +158,10 @@
   :debug_trace: false
   :capture_vm_created_on_date: false
   :ansible_tower_automation:
+    :inventory_object_refresh: true
     :refresh_interval: 15.minutes
   :embedded_ansible_automation:
+    :inventory_object_refresh: true
     :refresh_interval: 15.minutes
   :foreman_configuration:
     :refresh_interval: 15.minutes