Fixes #14643 - fixed FillDiscoveryAttributeSetsForExistingHosts migra…

…tion
theforeman · Apr 14, 2016 · b28beea · b28beea
1 parent 22eef81
commit b28beea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/models/host/discovered.rb b/app/models/host/discovered.rb
@@ -75,7 +75,7 @@ def attributes_to_import_from_facts
     super
   end
 
-  def populate_fields_from_facts(facts = self.facts_hash, ignored_type)
+  def populate_fields_from_facts(facts = self.facts_hash, ignored_type = nil)
     # detect interfaces and primary interface using extensions
     parser = super(facts, :foreman_discovery)
 

diff --git a/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb b/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb
@@ -1,6 +1,14 @@
 class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration
   def up
-    Host::Discovered.all.each { |host| host.populate_fields_from_facts}
+    Host::Discovered.all.each do |host|
+      begin
+        say "Populating attribute set for discovered host #{host.name}"
+        host.populate_fields_from_facts
+      rescue Exception => e
+        say "Error while populating host #{host.name}, deleting: #{e.message}:\n" + e.backtrace.join("\n")
+        host.destroy
+      end
+    end
   end
 
   def down