chef_handler_foreman 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8caa1aaba1f81ebd96619d99034eda28167bbf91
-  data.tar.gz: 8c52a7d53e164dbbdcbc1561ef726f78d0ec641a
+  metadata.gz: 21fab85d6ff9110b08cc8e2ee0282c3a3115bee1
+  data.tar.gz: c0e49b5679ef653d329936ac1e5d5084221af978
 SHA512:
-  metadata.gz: 4b5b990b57f01919095530c01679d957f41c2d5b1120efd37a93e7c3ce419eff4f81b46b23d100cc652498eacd7b501333969a0bf0a6a220925f08cb921d27f3
-  data.tar.gz: 40eeccfb567bafb2d476fa25e5c9c409299dfe46e9b589336c3ef96f765360af82bfa201e20c6a2e11f050717b80e963e937ae941c901350ab6a71ba5af2a842
+  metadata.gz: 9cdb697d5e51963f999af809a768d3552b2efabd92ce39b4527ac05ffdb174541cc09693fbf64e3ae24b095826413024f0f1296df5038d9449a0b67618ddeba1
+  data.tar.gz: 999b4f8cd62099bf400e4274e34f7dc2a6ea79324ded6d072ce1dcc17f22bdd9b9c1fecbd45d53daa94ce7541e27961deeee2e28fb7f79b987c66b8dcda3a963

data/README.md

@@ -20,6 +20,8 @@ In /etc/chef/client.rb:
 require 'chef_handler_foreman'
 # here you can specify your connection options
 foreman_server_options  :url => 'http://your.server/foreman'
+# Or another option to set URL if using chef-client cookbook config option
+foreman_server_url 'http://foreman.domain.com'
 # add following line if you want to upload node attributes (facts in Foreman language)
 foreman_facts_upload    true
 ## Facts whitelist / blacklisting
@@ -35,6 +37,34 @@ foreman_reports_upload  true
 reports_log_level       "notice"
 ```
 
+### Using Chef-Client Cookbook
+
+You can utilize the [Chef-Client](https://github.com/chef-cookbooks/chef-client) Cookbook to setup your client.rb
+
+With a Role
+
+```json
+"chef_client": {
+  "chef_server_url": "https://chef.domain.com",
+  "config": {
+    "foreman_server_url": "https://foreman.domain.com",
+    "foreman_facts_upload": true,
+    "foreman_reports_upload": true,
+    "reports_log_level": "notice"
+  }
+}
+```
+
+With attributes
+
+```ruby
+node['chef_client']['config']['foreman_server_url'] = 'https://foreman.domain.com'
+node['chef_client']['config']['foreman_facts_upload'] = true
+node['chef_client']['config']['foreman_reports_upload'] = true
+node['chef_client']['config']['reports_log_level'] = 'notice'
+```
+
+
 You can also specify a second argument to foreman_reports_upload which is a number:
 - 1 (default) for reporter based on more detailed ResourceReporter
 - 2 not so verbose based just on run_status, actually just counts applied resources
@@ -61,3 +91,7 @@ Cherry picking which facts to upload, coupled with caching, allows to scale the
 thousands of nodes. Note, however, that some attributes are expected by Foreman to exist, and thus
 should not be blacklisted. The whitelist and blacklist examples above include a minimal set of
 attributes known to work in a large scale production environment.
+
+Note that the order of config options matter. Blacklist/whitelist must be below foreman_facts_upload
+line.
+

data/lib/chef_handler_foreman/foreman_facts.rb

@@ -34,11 +34,11 @@ module ChefHandlerForeman
 
       os, release = nil
       if node.respond_to?(:lsb)
-        os = node.lsb[:id]
-        release = node.lsb[:release]
+        os = node['lsb']['id']
+        release = node['lsb']['release']
       end
-      os ||= node.platform
-      release ||= node.platform_version
+      os ||= node['platform']
+      release ||= node['platform_version']
 
       # operatingsystem and operatingsystemrelase are not needed since foreman_chef 0.1.3
       { :name  => node.name.downcase,
@@ -53,7 +53,7 @@ module ChefHandlerForeman
       }
     end
 
-    # if node.lsb[:id] fails and we use platform instead, normalize os names
+    # if node['lsb']['id'] fails and we use platform instead, normalize os names
     def normalize(os)
       case os
       when 'redhat'

data/lib/chef_handler_foreman/foreman_hooks.rb

@@ -10,9 +10,16 @@ require "#{File.dirname(__FILE__)}/foreman_uploader"
 
 module ChefHandlerForeman
   module ForemanHooks
+
+    # Provide a chef-client cookbook friendly option
+    def foreman_server_url(url)
+      foreman_server_options(:url => url)
+    end
+
     # {:url => '', ...}
-    def foreman_server_options(options)
-      options = { :client_key => client_key || '/etc/chef/client.pem' }.merge(options)
+    def foreman_server_options(options={})
+      options[:client_key] = client_key || '/etc/chef/client.pem' unless options[:client_key]
+      raise "No Foreman URL! Please provide a URL" unless options[:url]
       @foreman_uploader = ForemanUploader.new(options)
       # set uploader if handlers are already created
       @foreman_facts_handler.uploader = @foreman_uploader if @foreman_facts_handler

data/lib/chef_handler_foreman/foreman_reporting.rb

@@ -18,7 +18,7 @@ module ChefHandlerForeman
     attr_accessor :uploader
 
     def report
-      report                   = { 'host' => node.fqdn.downcase, 'reported_at' => Time.now.utc.to_s }
+      report                   = { 'host' => node['fqdn'].downcase, 'reported_at' => Time.now.utc.to_s }
       report_status            = Hash.new(0)
 
 

data/lib/chef_handler_foreman/foreman_resource_reporter.rb

@@ -68,6 +68,10 @@ module ChefHandlerForeman
       end
     end
 
+    def resource_bypassed(*args)
+      @why_run = true
+    end
+
     def post_reporting_data
       if reporting_enabled?
         run_data = prepare_run_data
@@ -105,13 +109,25 @@ module ChefHandlerForeman
     end
 
     def resources_per_status
-      { "applied"         => @total_updated,
-        "restarted"       => @total_restarted,
-        "failed"          => @total_failed,
-        "failed_restarts" => @total_failed_restart,
-        "skipped"         => @total_skipped,
-        "pending"         => 0
-      }
+      if @why_run
+        {
+          "applied"         => @total_updated,
+          "restarted"       => @total_restarted,
+          "failed"          => @total_failed,
+          "failed_restarts" => @total_failed_restart,
+          "skipped"         => @total_skipped,
+          "pending"         => 0
+        }
+      else
+        {
+          "applied"         => 0,
+          "restarted"       => 0,
+          "failed"          => 0,
+          "failed_restarts" => 0,
+          "skipped"         => @total_skipped,
+          "pending"         => @total_updated + @total_restarted + @total_failed + @total_failed_restart
+        }
+      end
     end
 
     def resources_per_time

data/lib/chef_handler_foreman/version.rb

@@ -1,3 +1,3 @@
 module ChefHandlerForeman
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: chef_handler_foreman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Chef handlers to integrate with foreman
@@ -65,20 +65,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This gem adds chef handlers so your chef-client can upload attributes (facts)
   and reports to Foreman
 test_files: []
-has_rdoc: