foreman_chef 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edcb1935f3e6cbde5d3b93780b8bb9665461658
-  data.tar.gz: 0f24cf01d0b5193aa0569196b2cb00afbacbb7f5
+  metadata.gz: 6796ab6f6a1582885cb7501e0a21f1b13d494a8a
+  data.tar.gz: ab358480f7a3e94647b4cd9faed9799229968bb0
 SHA512:
-  metadata.gz: 98e1238b372991d47c2c188069eaee3c78487bfdbfd3944bfac465f9a86bc50a50acd9c478f950120af01af23e84fba0823de7fd791c067da0bae7b248837370
-  data.tar.gz: 62b3f107c9a6d64771f844cef809d44e64a0785167ab0df7bcae7fa147b9fae5936cc726639895314d4ee1149a38db2f9d3246e897f148c2d35b4d674b2cd6f6
+  metadata.gz: 7d5a31b0b6cf7ff354f00d037407d58ae24e4f670fe8bf813f3c1ad88ec71393e33704fa37e75639cee30473314c1ecb4c227a8e5fb1e5fa36103116856bc66b
+  data.tar.gz: 510e7db1c35c2499bc185838acb178ff678cb9b869ff6517de3e7202ddac7fbc243a847e05e8d90c9f4a46385e1643d118b356f7f8dde67bb80dfb7d82b738d5

data/app/models/foreman_chef/fact_parser.rb

@@ -6,7 +6,12 @@ module ForemanChef
     def operatingsystem
       os_name = facts['lsb::id'] || facts['platform']
       release = facts['lsb::release'] || facts['platform_version']
-      major, minor = release.split('.')
+      # if we have no release information we can't assign OS properly (e.g. missing redhat-lsb)
+      if release.nil?
+        major, minor = 1, nil
+      else
+        major, minor = release.split('.')
+      end
       description = facts['lsb::description']
       release_name = facts['lsb::codename']
 
@@ -17,7 +22,7 @@ module ForemanChef
         klass = Operatingsystem
       end
 
-      args = { :name => os_name, :major => major, :minor => minor }
+      args = { :name => os_name, :major => major.to_s, :minor => minor.to_s }
       klass.where(args).first || klass.new(args.merge(:description => description, :release_name => release_name)).save!
     end
 

data/db/seeds.rb

@@ -16,7 +16,7 @@ end
 
 # Global parameters used in configuration snippets
 parameters = [
-  { :name => 'chef_handler_foreman_url', :value => SmartProxy.chef_proxies.first.try(:url) || Setting.foreman_url },
+  { :name => 'chef_handler_foreman_url', :value => SmartProxy.with_features('Chef').first.try(:url) || Setting.foreman_url },
   { :name => 'chef_server_url', :value => "https://#{Socket.gethostbyname(Socket.gethostname).first}" },
   { :name => 'chef_validation_private_key', :value => 'UNSPECIFIED, you must upload your validation key here' },
   { :name => 'chef_bootstrap_template', :value => 'chef-client omnibus bootstrap' },

data/lib/foreman_chef/engine.rb

@@ -48,7 +48,7 @@ module ForemanChef
       ::Hostgroup.send :include, ChefProxyAssociation
       ::SmartProxy.send :include, SmartProxyExtensions
       ::FactImporter.register_fact_importer(:foreman_chef, ForemanChef::FactImporter)
-      ::FactParser.register_fact_importer(:foreman_chef, ForemanChef::FactParser)
+      ::FactParser.register_fact_parser(:foreman_chef, ForemanChef::FactParser)
       ::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
       ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
     end

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails