foreman_discovery 1.4.0.rc2 → 1.4.0.rc3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgxMDAyZjVkZWJkMjE2NDRmMDMwODUwNjI0YTQ1ZDA2NjgwNGRhMg==
+    ODU0YmFjMjdiMDU4NzI3YTdmNTcxYmFiYmY5NDRkM2E0MTY3NjIxMA==
   data.tar.gz: !binary |-
-    MDk1NDMyNDJhM2Q0MDk5ZjY3ODgwNzc4ZjE0MzVkODJiODI2YjdlMA==
+    N2IwODQ5YTBjMTBkNTQ0NzA3MDYzNGJjMzNhZjNiY2E2ODM2ZmE1OQ==
 SHA512:
   metadata.gz: !binary |-
-    MzYyNzIyMGQxMWM1ZjM5MTMxMWI0ZDk3N2FkNjQ2YzI5MzBiNjgyZGJmYTRm
-    NTQ2MDg0M2FjODQzNDA5N2Y1ZGIyNmE1YmIwN2I4MDY2NzVkZTEwNWZjZmYx
-    N2NlYzZlOWYxODBlYTQ5YjA3NDZmZGU4MDBkYzJmMDE0OTBiZGY=
+    NzI3MDM5NDk4NTM3ZTdkMzBlZGYzNjM4ZTg3OGIyZDE2ZDYxYWFkODJhMDYy
+    YWI2N2M1YzZkM2ZhMjdhZGIzOGVlMGVkYjg5Yzg4YjM5MGNiYjdjMzcxOTQy
+    NzY0YjhkNDk0YmFhNjNlODc4M2VmNWNmYzI5NmNiYzk1ZDU1ZmU=
   data.tar.gz: !binary |-
-    NDBkMTU2Y2YwMmU2MzBiNGE1ZmY5Zjc0ZmM1MDhkYzg3YWU4NTVmNzYwNGQz
-    YjlkNjBjNDQ2NDE5YmQ0ZTBjYThhMTg5MTBmYTU5MmJlMDYzYmNkMTdjZmU4
-    NTM2ODliOTFjZjVmNzQ0ODliMWNlYTdmNjM0ODA4MmUxYmZiY2Y=
+    OTk1YmJmYmYxZTk3ZmU4YzA3NTdlMjA4NjUyY2ZhYjM3YTA2MmY4ZTY3ZmE5
+    NGY0ODAxODAxNzg1NDk2ZjE0MDIxZWMwZGQzODg4MTdhNzJmMDE0MTQ3ZjMz
+    YjQxMjRlODdlYmQ3OWVhYTdlMTEzZWU1OTMxOTQzNWVmNWY1YjE=

data/app/models/host/discovered.rb

@@ -75,8 +75,13 @@ class Host::Discovered < ::Host::Base
     super + [:ip]
   end
 
-  def populate_fields_from_facts facts = self.facts_hash
-    importer = super
+  def populate_fields_from_facts facts = self.facts_hash, type = 'puppet'
+    # type arg only added in 1.7
+    if Gem::Dependency.new('', '> 1.6').match?('', SETTINGS[:version].notag)
+      importer = super
+    else
+      importer = super(facts)
+    end
     self.subnet = Subnet.subnet_for(importer.ip)
     self.save
   end

data/lib/foreman_discovery/engine.rb

@@ -75,7 +75,7 @@ module ForemanDiscovery
     config.to_prepare do
       # Include host extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
-      ::PuppetFactParser.send :include, PuppetFactParserExtensions
+      ::PuppetFactParser.send :include, PuppetFactParserExtensions if defined? PuppetFactParser
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.4.0.rc2"
+  VERSION = "1.4.0.rc3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 1.4.0.rc3
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4