foreman_chef 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6796ab6f6a1582885cb7501e0a21f1b13d494a8a
-  data.tar.gz: ab358480f7a3e94647b4cd9faed9799229968bb0
+  metadata.gz: 34baa9fbd879b204ef8fd14c6bc7b10718a0325c
+  data.tar.gz: 09983b5418b094d2821a7d51fb43bac42a53291e
 SHA512:
-  metadata.gz: 7d5a31b0b6cf7ff354f00d037407d58ae24e4f670fe8bf813f3c1ad88ec71393e33704fa37e75639cee30473314c1ecb4c227a8e5fb1e5fa36103116856bc66b
-  data.tar.gz: 510e7db1c35c2499bc185838acb178ff678cb9b869ff6517de3e7202ddac7fbc243a847e05e8d90c9f4a46385e1643d118b356f7f8dde67bb80dfb7d82b738d5
+  metadata.gz: 046f7031449f7bf4724d463d4986604bcd844dc7df446ea09f30ce9a4d50bedf6a0418f217f18c376167fdaa71553c96332961d154ace1e3d846e6befe574abf
+  data.tar.gz: 241ecedcb2ee2d5df74cc6e4af89a36c8d7fccdee8de3c16f7020b680d61bf450f0925aa80dfdce8ee2daf8fd163d77bf626a2614cbe208dce875aab97e02941

data/README.md

@@ -1,29 +1,27 @@
 # ForemanChef
 
-This plugin adds a Chef fact importer to Foreman. It basically means that when you setup your chef
-clients to use foreman handlers (https://github.com/theforeman/chef-handler-foreman) and install
-this plugin you receive nested facts from chef-client.
+This plugin adds a Chef support to Foreman. You can find all information 
+[in the plugin manual](http://www.theforeman.org/plugins/foreman_chef/0.2)
 
 # Installation
 
-If you want to use this in production I recommend to combine this plugin with foreman-background
-(https://github.com/ohadlevy/foreman-background) which runs report and facts import as a background
-tasks.
+There are two ways to install the plugin:
 
 ## Foreman Installer (recommended)
 
-Follow the directions on: http://www.theforeman.org/plugins/foreman_chef/0.1/#2.Installation
+Follow the instructions on: http://www.theforeman.org/plugins/foreman_chef/0.2/#2.Installation
 
 ## Manual
 
-This plugin expects foreman to support nested facts which is was added in 1.4.
 To install this plugin you just have to add this line to your Gemfile.
 
 ```ruby
 gem 'foreman_chef'
 ```
 
-and run ```bundle install```. Don't forget to restart foreman after this change.
+and run ```bundle install```. Don't forget to restart foreman after this change. You also have
+to run migrations and seed. Note that this plugin requires also plugin on smart proxy and chef-handler-foreman
+on client side.
 
 ##  License
 

data/app/lib/actions/foreman_chef/client/destroy.rb

@@ -11,8 +11,7 @@ module Actions
             end
           end
         rescue => e
-          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
-          Rails.logger.debug e.backtrace.join("\n")
+          Foreman::Logging.exception('Unable to communicate with Chef proxy', e)
           raise ::ForemanChef::ProxyException.new(N_('Unable to communicate with Chef proxy, %s' % e.message))
         end
 

data/app/lib/actions/foreman_chef/host/destroy.rb

@@ -16,8 +16,7 @@ module Actions
             plan_action Actions::ForemanChef::Client::Destroy, host.name, proxy
           end
         rescue => e
-          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
-          Rails.logger.debug e.backtrace.join("\n")
+          Foreman::Logging.exception('Unable to communicate with Chef proxy', e)
           raise ::ForemanChef::ProxyException.new(N_('Unable to communicate with Chef proxy, %s' % e.message))
         end
 

data/app/models/foreman_chef/fact_importer.rb

@@ -18,6 +18,10 @@ module ForemanChef
 
     attr_accessor :original_facts
 
+    def logger
+      Foreman::Logging.logger('foreman_chef')
+    end
+
     def add_new_facts
       @counters[:added] = 0
       add_missing_facts(Sparser.new.unsparse(original_facts))

data/app/models/foreman_chef/fact_parser.rb

@@ -12,8 +12,14 @@ module ForemanChef
       else
         major, minor = release.split('.')
       end
-      description = facts['lsb::description']
-      release_name = facts['lsb::codename']
+
+      if facts['platform'] == 'windows'
+        release_name = facts['kernel::name']
+        os_name = os_name.capitalize
+      else
+        description = facts['lsb::description']
+        release_name = facts['lsb::codename']
+      end
 
       begin
         klass = os_name.constantize
@@ -23,7 +29,7 @@ module ForemanChef
       end
 
       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!
+      klass.where(args).first || klass.new(args.merge(:description => description, :release_name => release_name)).tap(&:save!)
     end
 
     def environment
@@ -71,6 +77,10 @@ module ForemanChef
 
     private
 
+    def logger
+      Foreman::Logging.logger('foreman_chef')
+    end
+
     # meant to be implemented in inheriting classes
     # should return hash with indifferent access in following format:
     # { 'link': 'true',

data/app/models/foreman_chef/smart_proxy_extensions.rb

@@ -7,7 +7,7 @@ module ForemanChef
       reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_node(fqdn)
       JSON.parse(reply)
     rescue RestClient::ResourceNotFound
-      logger.debug "Node '#{fqdn}' not found"
+      Foreman::Logging.logger('foreman_chef').debug "Node '#{fqdn}' not found"
       return false
     end
 
@@ -23,7 +23,7 @@ module ForemanChef
       reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_client(fqdn)
       JSON.parse(reply)
     rescue RestClient::ResourceNotFound
-      logger.debug "Client '#{fqdn}' not found"
+      Foreman::Logging.logger('foreman_chef').debug "Client '#{fqdn}' not found"
       return false
     end
 

data/db/seeds.rb

@@ -11,7 +11,7 @@ templates = [
 
 templates.each do |template|
   template[:template] = File.read(File.join(ForemanChef::Engine.root, "app/views/foreman/unattended", template.delete(:source)))
-  ConfigTemplate.find_or_create_by_name(template).update_attributes(defaults.merge(template))
+  ProvisioningTemplate.find_or_create_by_name(template).update_attributes(defaults.merge(template))
 end
 
 # Global parameters used in configuration snippets

data/lib/foreman_chef/engine.rb

@@ -26,7 +26,7 @@ module ForemanChef
 
     initializer 'foreman_chef.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.4'
+        requires_foreman '>= 1.9'
         allowed_template_helpers :chef_bootstrap
       end
     end

data/lib/foreman_chef/version.rb

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

metadata

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