foreman_salt 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7affbd070e0fa9e5bbe3ad20fb5d6b37414a561d
-  data.tar.gz: 05526bb14642019dc1fb4be52425ce304533f1cb
+  metadata.gz: b2e704b1c9a00f0dbe9fd037dda98eee1125226a
+  data.tar.gz: 2dbf54a0bb81a8047f2b127bbb181a1bca864df8
 SHA512:
-  metadata.gz: 1a4faeebaca7c47a018ff6ea58ae35fe23ef91eea86813aa24e0efb561a62224c35a7402efff4d721b3c748981601bed5a3f07d1638c3183ba33e880befece4e
-  data.tar.gz: 546d539de6da702b378b4d9d6deaa63c75d52b1ea3856af6b83db1bfdcf087ee1ba82ef8538141a0258daed24565ed0c2b633b6bd6084d2f108d09f9c850dae7
+  metadata.gz: 043727e462c0e56b777a8f0dfe11d0411cebe0a68dc5fc7df2341b7186f7f146c22fa2d7f66ccbe5b5923fd724115d527387eebc7dbf7101110e4da403d3d423
+  data.tar.gz: afb5cb54391a270c2246bd717097ae2f92f2fbf17fec76076c73a9293b01e4d5704d91477317496376187257f8ad05b0b5349b76d993901c48b8fc9b9f1e37eb

data/app/services/foreman_salt/fact_parser.rb

@@ -80,8 +80,14 @@ module ForemanSalt
     private
 
     def os_hash
-      (_, major, minor) = /(\d+)\.?(\d+)?\.?(\d+)?/.match(facts[:osrelease]).to_a
-      { :name => facts[:os], :major => major, :minor => minor }
+      name = facts[:os]
+      (_, major, minor, sub) = /(\d+)\.?(\d+)?\.?(\d+)?/.match(facts[:osrelease]).to_a
+      if name == 'CentOS'
+        if sub
+          minor += '.' + sub
+          end
+      end
+      { :name => name, :major => major, :minor => minor }
     end
 
     def macs

data/app/services/foreman_salt/report_importer.rb

@@ -61,9 +61,10 @@ module ForemanSalt
       @raw.each do |resource, result|
         level = if result['changes'].blank? && result['result']
                   :info
-                elsif !result['result']
+                elsif result['result'] == false
                   :err
                 else
+                  # nil mean "unchanged" when running highstate with test=True
                   :notice
                 end
 
@@ -88,6 +89,7 @@ module ForemanSalt
       changed = 0
       restarted = 0
       restarted_failed = 0
+      pending = 0
 
       time = {}
 
@@ -101,6 +103,8 @@ module ForemanSalt
           elsif !result['changes'].blank?
             changed += 1
           end
+        elsif result['result'].nil?
+            pending += 1
         elsif !result['result']
           if resource.match(/^service_/) && result['comment'].include?('restarted')
             restarted_failed += 1
@@ -126,7 +130,7 @@ module ForemanSalt
       changes = { :total => changed + restarted }
 
       resources = { 'total' => @raw.size, 'applied' => changed, 'restarted' => restarted, 'failed' => failed,
-                    'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0 }
+                    'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0, 'pending' => pending }
 
       { :events => events, :resources => resources, :changes => changes, :time => time }
     end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '8.0.1'
+  VERSION = '8.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com
@@ -189,21 +189,21 @@ specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
 - test/factories/foreman_salt_factories.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/unit/host_extensions_test.rb
+- test/unit/salt_keys_test.rb
+- test/unit/grains_importer_test.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
+- test/unit/salt_modules_test.rb
+- test/unit/highstate.json
+- test/unit/grains_centos.json
+- test/functional/minions_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
 - test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/minions_controller_test.rb
 - test/integration/salt_autosign_test.rb
-- test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
+- test/integration/salt_environment_test.rb
 - test/integration/salt_module_test.rb
-- test/unit/grains_centos.json
-- test/unit/highstate.json
-- test/unit/salt_keys_test.rb
-- test/unit/salt_modules_test.rb
-- test/unit/hostgroup_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/grains_importer_test.rb
-- test/unit/host_extensions_test.rb
 - test/test_plugin_helper.rb