foreman_chef 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa5c33d32cd0eb2a1afb2ad360270f1029f2e07
-  data.tar.gz: 87ed4806bdad133c707201d35acc8266bcabcdd5
+  metadata.gz: 57d753bf6cad20e4c8f3f0e42d4cb54c2ea512e2
+  data.tar.gz: 7e475417097bdde646e155490805d0aa7ea3a944
 SHA512:
-  metadata.gz: c00b8dec56a8acf31f27c8e106fdf94c40d7f722278f00330bc45f292fe9c37a850178351f07442f5ae0b42c136acbbd42bb38c07a31e9e9fc4842857365305c
-  data.tar.gz: 16da4020f14a9b96cf2a6fcf3e388fb7c401fb3740e933f8407f919d2db269254606d312a47fd02cf800f432baf48aa860576fa804db87796886b368bb9e8c3f
+  metadata.gz: 3e320c37bb73d8cbee67781de5ee4eef0d17d21812c5600fb5de76402f6cb891ca906d7c0b1080182d5d848477904689e99dd8149ee5cc00d470072f12abc0f0
+  data.tar.gz: 10665df2e4facabc26657275d43da9c530f8df3d8cc541acba54a639cd02b81bc7147b163f68c7dc3701e0a18607fbfb37fcb40c3456e71ae00f04eeb6a769e2

data/app/helpers/foreman_chef/chef_proxy_form.rb

@@ -32,10 +32,14 @@ module ForemanChef
                  :data => { :url => environments_for_chef_proxy_foreman_chef_environments_path } })
     end
 
-    def chef_tab_menu
+    def chef_tab_menu(host)
       if SmartProxy.with_features("Chef").count > 0
+        warning = ''
+        if chef_run_list_differs?(host)
+          warning = content_tag(:span, ' '.html_safe, :class => "pficon pficon-warning-triangle-o")
+        end
         content_tag :li do
-          '<a href="#chef" data-toggle="tab">Chef</a>'.html_safe
+          link_to(warning + _('Chef'), '#chef', :data => { :toggle => 'tab'})
         end
       end
     end
@@ -43,5 +47,9 @@ module ForemanChef
     def chef_tab_content(f)
       render 'foreman_chef/hosts/chef_tab', :f => f
     end
+
+    def chef_run_list_differs?(host)
+      host.persisted? && host.chef_proxy_id.present? && host.run_list_differs?
+    end
   end
 end

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

@@ -4,6 +4,8 @@ module Actions
       class Create < Actions::EntryAction
 
         def plan(name, proxy)
+          return if proxy.nil?
+
           client_exists_in_chef = proxy.show_client(name)
           if client_exists_in_chef
             raise ::ForemanChef::ObjectExistsException.new(N_('Client with name %s already exist on this Chef proxy' % name))

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

@@ -4,7 +4,7 @@ module Actions
       class Destroy < Actions::EntryAction
 
         def plan(fqdn, proxy)
-          if ::Setting::ForemanChef.auto_deletion
+          if ::Setting::ForemanChef.auto_deletion && proxy.present?
             client_exists_in_chef = proxy.show_client(fqdn)
             if client_exists_in_chef
               plan_self :chef_proxy_id => proxy.id, :fqdn => fqdn

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

@@ -32,7 +32,7 @@ module Actions
         end
 
         def finalize
-          if input[:create_action_output][:private_key].present? && Setting.validation_bootstrap_method
+          if input[:create_action_output][:private_key].present? && !Setting.validation_bootstrap_method
             host = ::Host.find(self.input[:host][:id])
             host.chef_private_key = input[:create_action_output][:private_key]
             host.disable_dynflow_hooks { |h| h.save! }

data/app/lib/actions/foreman_chef/node/update.rb

@@ -5,6 +5,8 @@ module Actions
 
         def plan(host, proxy)
           name = host.name
+          raise ::ForemanChef::HostDoesNotHaveChefProxy.new(N_('Host with name %s does not have chef proxy specified but asked to update the node') % name) if proxy.nil?
+
           node_exists_in_chef = proxy.show_node(name)
           if node_exists_in_chef
             # we can't use host.run_list.list_changed? or similar since it's after_save already

data/app/models/foreman_chef/concerns/host_build.rb

@@ -6,6 +6,8 @@ module ForemanChef
         include ForemanTasks::Concerns::ActionSubject
         include ForemanTasks::Concerns::ActionTriggering
 
+        alias_method_chain :setSSHProvisionScript, :chef
+
         after_build do |host|
           ::ForemanTasks.sync_task ::Actions::ForemanChef::Client::Destroy, host.name, host.chef_proxy
           # private key is no longer valid
@@ -20,6 +22,18 @@ module ForemanChef
         end
       end
 
+      def setSSHProvisionScript_with_chef
+        ::ForemanTasks.sync_task ::Actions::ForemanChef::Client::Destroy, self.name, self.chef_proxy
+        # private key is no longer valid
+        self.chef_private_key = nil
+
+        if !::Setting.validation_bootstrap_method
+          new_client = ::ForemanTasks.sync_task ::Actions::ForemanChef::Client::Create, self.name, self.chef_proxy
+          self.chef_private_key = new_client.output[:private_key]
+        end
+
+        self.disable_dynflow_hooks { |h| setSSHProvisionScript_without_chef; h.save! }
+      end
     end
   end
 end

data/app/models/foreman_chef/concerns/smart_proxy_extensions.rb

@@ -4,9 +4,19 @@ module ForemanChef
       extend ActiveSupport::Concern
 
       included do
+        alias_method_chain :taxonomy_foreign_conditions, :chef
+
         has_many :chef_environments, :class_name => "::ForemanChef::Environment", :foreign_key => 'chef_proxy_id'
       end
 
+      def taxonomy_foreign_conditions_with_chef
+        conditions = taxonomy_foreign_conditions_without_chef
+        if has_feature?('Chef')
+          conditions[:chef_proxy_id] = id
+        end
+        conditions
+      end
+
       # create or overwrite instance methods...
       def show_node(fqdn)
         reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).show_node(fqdn)

data/app/models/foreman_chef/fact_importer.rb

@@ -1,5 +1,5 @@
 module ForemanChef
-  class FactImporter < ::FactImporter
+  class FactImporter < ::StructuredFactImporter
     class FactNameImportError < StandardError; end
 
     def fact_name_class
@@ -71,7 +71,7 @@ module ForemanChef
     end
 
     def facts_to_create
-      @facts_to_create ||= facts.keys - db_facts.keys
+      @facts_to_create ||= facts.keys - db_facts.pluck('fact_names.name')
     end
 
     def fact_names
@@ -103,10 +103,6 @@ module ForemanChef
       new_facts
     end
 
-    def sort_by_key(hash)
-      hash.sort_by { |k, v| k.to_s }
-    end
-
     class Sparser
       def sparse(hash, options={})
         hash.map do |k, v|

data/app/models/foreman_chef/fact_parser.rb

@@ -17,10 +17,20 @@ module ForemanChef
         release_name = facts['kernel::name']
         os_name = os_name.capitalize
       else
-        description = facts['lsb::description']
+        # to keep OS names consistent with other cfgmgt agents we skip description importing
+        # description = facts['lsb::description']
         release_name = facts['lsb::codename']
       end
 
+      # So far only CentOS needs exception
+      case os_name
+        when 'CentOS'
+          if major.to_i >= 7
+            # get the minor.build number, e.g. 7.2.1511 -> 2.1511
+            minor = release[2..-1]
+          end
+      end
+
       begin
         klass = os_name.constantize
       rescue NameError => e
@@ -29,7 +39,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)).tap(&:save!)
+      klass.where(args).first || klass.new(args.merge(:release_name => release_name)).tap(&:save!)
     end
 
     # we don't want to parse puppet environment, foreman_chef already has its own environment

data/app/models/setting/foreman_chef.rb

@@ -15,4 +15,8 @@ class Setting::ForemanChef < Setting
 
   end
 
+  def self.humanized_category
+    _('Chef')
+  end
+
 end

data/app/overrides/add_chef_tab.rb

@@ -1,7 +1,7 @@
 Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "add_chef_tab",
                      :insert_before => 'li#network_tab',
-                     :text => ("<%= chef_tab_menu %>")
+                     :text => ("<%= chef_tab_menu(f.object) %>")
 )
 Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "add_chef_tab_pane",

data/app/services/foreman_chef/host_does_not_have_chef_proxy.rb

@@ -0,0 +1,4 @@
+module ForemanChef
+  class HostDoesNotHaveChefProxy < Foreman::Exception
+  end
+end

data/app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb

@@ -41,6 +41,7 @@ require 'chef_handler_foreman'
 foreman_server_options  :url => "<%= @host.params['chef_handler_foreman_url'] %>"
 foreman_facts_upload    true
 foreman_reports_upload  true
+foreman_enc             true
 EOF
 
 # You may set here the default run list for all your nodes
@@ -55,5 +56,8 @@ echo "First run of chef-client"
 
 echo "Finished, cleaning"
 rm -f /tmp/base.json
+
+<% if validation_bootstrap_method? -%>
 # you can comment this line to keep validaton.pem (e.g. for debugging purposes)
 rm -f /etc/chef/validation.pem
+<% end -%>

data/app/views/foreman_chef/hosts/_chef_tab.html.erb

@@ -2,7 +2,7 @@
 
 <div class="tab-pane" id="chef">
 
-  <% if f.object.persisted? && f.object.run_list_differs? %>
+  <% if chef_run_list_differs?(f.object) %>
     <%= alert(:class => 'alert-warning', :header => 'Warning',
               :text => _('Run list on chef server differs, by submitting the form, you will override the run list there. ').html_safe +
                   link_to(_('Reset'), '#', :class => 'refresh_run_list', :'data-run-list' => (f.object.fresh_run_list.try(:to_form_json) || '[]')) +

data/lib/foreman_chef/engine.rb

@@ -47,7 +47,7 @@ module ForemanChef
 
     initializer 'foreman_chef.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.13'
+        requires_foreman '>= 1.14'
         extend_template_helpers ForemanChef::Concerns::Renderer
 
         permission :import_chef_environments, { :environments => [:import, :synchronize] }, :resource_type => 'ForemanChef::Environment'
@@ -90,10 +90,8 @@ module ForemanChef
       ::Host::Managed.send :include, ForemanChef::Concerns::HostActionSubject
       ::Host::Managed.send :include, ForemanChef::Concerns::HostBuild
       ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
-    end
 
-    config.after_initialize do
-      ::Foreman::Renderer.send :include, ForemanChef::Concerns::Renderer
+      ::Host::Managed.send :include, ForemanChef::Concerns::Renderer
     end
   end
 

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -95,6 +95,7 @@ files:
 - app/overrides/add_chef_proxy.rb
 - app/overrides/add_chef_tab.rb
 - app/services/foreman_chef/chef_server_importer.rb
+- app/services/foreman_chef/host_does_not_have_chef_proxy.rb
 - app/services/foreman_chef/object_does_not_exist_exception.rb
 - app/services/foreman_chef/object_exists_exception.rb
 - app/services/foreman_chef/proxy_exception.rb