foreman_chef 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e67f70cef7f3befb5de89b4ed9ba5164a1bf78e
-  data.tar.gz: c93ad84ca9bffac5f641373dc1656c8885780363
+  metadata.gz: 4ca6ce84d67a9c71ce00228a2cab0999e53662de
+  data.tar.gz: 97027fe6bc7f56b742a8d568d81a7c047ced35c2
 SHA512:
-  metadata.gz: f47ceac026045db387dc16f6485c5e0fd340cf81dbfad967114c0b8c04f3ad8c2ebfad35f3f872dd570155919fa8305c8066173516e15e505eff132020d00747
-  data.tar.gz: 6a513a09021f79f978217a7a96d465b9e7f9d254859f914a8b85578d5be6e6a63614b7457ecfd62f5b3d2aa2994d9b0cca939b97d2853a624345dae472f70e6f
+  metadata.gz: e28b20f1dabcfa8e5a82d66214cf4ad5b54ca54e537816967d625bdd1917814ae66a330ede1ac2371ee751cc2f00221d3e78453860af8820b7d791558c767b1b
+  data.tar.gz: 59891a29fe06894f06155574b0ca0f96c42bab8f5b9472481dae3f3fb971083cf07b3c44976c6f56398af6c4644b5981b49655132f57123d6dfa0ef9793e104c

data/app/assets/javascripts/foreman_chef/chef_proxy_environment_refresh.js

@@ -1,4 +1,4 @@
-$(function () {
+$(document).on('ContentLoad', function (){
   $("#host_chef_proxy_id, #hostgroup_chef_proxy_id").change(function () {
     var element = $(this);
     var attrs = attribute_hash(['chef_proxy_id']);
@@ -23,4 +23,3 @@ $(function () {
     });
   });
 });
-

data/app/controllers/foreman_chef/concerns/environment_parameters.rb

@@ -0,0 +1,19 @@
+module ForemanChef
+  module Concerns
+    module EnvironmentParameters
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def environment_params_filter
+          Foreman::ParameterFilter.new(::ForemanChef::Environment).tap do |filter|
+            filter.permit(:name, :description, :chef_proxy_id)
+          end
+        end
+      end
+
+      def environment_params
+        self.class.environment_params_filter.filter_params(params, parameter_filter_context, 'foreman_chef_environment')
+      end
+    end
+  end
+end

data/app/controllers/foreman_chef/environments_controller.rb

@@ -1,6 +1,8 @@
 module ForemanChef
   class EnvironmentsController < ::ForemanChef::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
+    include ForemanChef::Concerns::EnvironmentParameters
+
     before_filter :find_resource, :only => [:edit, :update, :destroy]
 
     def import
@@ -34,7 +36,7 @@ module ForemanChef
     end
 
     def create
-      @environment = ForemanChef::Environment.new(params[:foreman_chef_environment])
+      @environment = ForemanChef::Environment.new(environment_params)
       if @environment.save
         process_success
       else
@@ -46,7 +48,7 @@ module ForemanChef
     end
 
     def update
-      if @environment.update_attributes(params[:foreman_chef_environment])
+      if @environment.update_attributes(environment_params)
         process_success
       else
         process_error

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

@@ -0,0 +1,36 @@
+module Actions
+  module ForemanChef
+    module Client
+      class Create < Actions::EntryAction
+
+        def plan(name, proxy)
+          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))
+          else
+            plan_self :chef_proxy_id => proxy.id, :name => name
+          end
+        rescue => e
+          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
+          Rails.logger.debug e.backtrace.join("\n")
+          raise ::ForemanChef::ProxyException.new(N_('CLIENT Unable to communicate with Chef proxy, %s' % e.message))
+        end
+
+        def run
+          proxy = ::SmartProxy.find_by_id(input[:chef_proxy_id])
+          action_logger.debug "Creating client #{input[:name]} on proxy #{proxy.name} at #{proxy.url}"
+          self.output = proxy.create_client(input[:name])
+        end
+
+        def humanized_name
+          _("Create client")
+        end
+
+        def humanized_input
+          input[:name]
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,51 @@
+module Actions
+  module ForemanChef
+    module Host
+      class Create < Actions::EntryAction
+
+        def plan(host)
+          action_subject(host)
+
+          if host.chef_proxy
+            client_exists_in_chef = host.chef_proxy.show_client(host.name)
+
+            sequence do
+              if client_exists_in_chef
+                plan_action Actions::ForemanChef::Client::Destroy, host.name, host.chef_proxy
+              end
+
+              unless ::Setting::ForemanChef.validate_bootstrap_method
+                client_creation = plan_action Actions::ForemanChef::Client::Create, host.name, host.chef_proxy
+              end
+
+              plan_self(:create_action_output => client_creation.output)
+            end
+          end
+        rescue => e
+          Rails.logger.debug "Unable to communicate with Chef proxy, #{e.message}"
+          Rails.logger.debug e.backtrace.join("\n")
+          raise ::ForemanChef::ProxyException.new(N_('Unable to communicate with Chef proxy, %s' % e.message))
+        end
+
+        # def run
+        #   # TODO create node with runlist?
+        # end
+
+        def finalize
+          if input[:create_action_output][:private_key].present?
+            ::Host.find(self.input[:host][:id]).update_attribute(:chef_private_key, input[:create_action_output][:private_key])
+          end
+        end
+
+        def humanized_name
+          _("Create node")
+        end
+
+        def humanized_input
+          input[:host][:name]
+        end
+      end
+    end
+  end
+end
+

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

@@ -7,7 +7,7 @@ module Actions
 
         def plan(host)
           action_subject(host)
-          if (::Setting::ForemanChef.auto_deletion && proxy = ::SmartProxy.find_by_id(host.chef_proxy_id))
+          if (::Setting::ForemanChef.auto_deletion && proxy = host.chef_proxy)
             node_exists_in_chef = proxy.show_node(host.name)
             if node_exists_in_chef
               plan_self :chef_proxy_id => host.chef_proxy_id

data/app/lib/proxy_api/foreman_chef/chef_proxy.rb

@@ -43,14 +43,21 @@ module ProxyAPI
       end
 
       # Shows a Chef Client entry
-      # [+key+] : String containing the hostname
-      # Returns : Hash representation of host on chef server
+      # [+key+] : String containing the client name
+      # Returns : Hash representation of client on chef server
       def show_client(key)
         Client.new(@args).send(:get, key)
       end
 
+      # Creates a Chef Client entry
+      # [+key+] : String containing the client name
+      # Returns : Hash representation of client on chef server
+      def create_client(key)
+        Client.new(@args).send(:post, :client => {:name => key})
+      end
+
       # Deletes a Chef Client entry
-      # [+key+] : String containing the hostname
+      # [+key+] : String containing the client name
       # Returns : Boolean status
       def delete_client(key)
         Client.new(@args).send(:delete, key)

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

@@ -5,6 +5,11 @@ module ForemanChef
       include ForemanTasks::Concerns::ActionSubject
       include ForemanTasks::Concerns::ActionTriggering
 
+      def create_action
+        sync_action!
+        ::Actions::ForemanChef::Host::Create
+      end
+
       def destroy_action
         sync_action!
         ::Actions::ForemanChef::Host::Destroy
@@ -18,5 +23,5 @@ module ForemanChef
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :chef_proxy, :chef_environment
+  allow :chef_proxy, :chef_environment, :chef_private_key
 end

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

@@ -6,8 +6,6 @@ module ForemanChef
       included do
         belongs_to :chef_proxy, :class_name => "SmartProxy"
         belongs_to :chef_environment, :class_name => "ForemanChef::Environment"
-
-        attr_accessible :chef_proxy_id, :chef_environment_id
       end
 
       def available_chef_environments

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

@@ -0,0 +1,14 @@
+module ForemanChef
+  module Concerns
+    module HostBuild
+      extend ActiveSupport::Concern
+      included do
+        include ForemanTasks::Concerns::ActionSubject
+        include ForemanTasks::Concerns::ActionTriggering
+
+        after_build :plan_destroy_action
+      end
+
+    end
+  end
+end

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

@@ -9,6 +9,10 @@ module ForemanChef
         raise SecurityError, 'snippet contains not white-listed characters' unless snippet_name =~ /\A[a-zA-Z0-9 _-]+\Z/
         snippet snippet_name
       end
+
+      def validation_bootstrap_method?
+        ::Setting::ForemanChef.validate_bootstrap_method
+      end
     end
   end
 end

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

@@ -32,6 +32,13 @@ module ForemanChef
         return false
       end
 
+      def create_client(fqdn)
+        begin
+          reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).create_client(fqdn)
+          JSON.parse(reply)
+        end
+      end
+
       def delete_client(fqdn)
         begin
           reply = ProxyAPI::ForemanChef::ChefProxy.new(:url => url).delete_client(fqdn)

data/app/models/foreman_chef/environment.rb

@@ -9,8 +9,6 @@ module ForemanChef
     has_many :hostgroups, :class_name => '::Hostgroup'
     belongs_to :chef_proxy, :class_name => '::SmartProxy'
 
-    attr_accessible :name, :description, :chef_proxy_id
-
     validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_('is alphanumeric and cannot contain spaces') }
 
     scoped_search :on => :name, :complete_value => true

data/app/models/foreman_chef/fact_name.rb

@@ -1,5 +1,4 @@
 module ForemanChef
   class FactName < ::FactName
-    attr_accessible :compose
   end
 end

data/app/models/setting/foreman_chef.rb

@@ -6,7 +6,8 @@ class Setting::ForemanChef < Setting
 
     self.transaction do
       [
-          self.set('auto_deletion', N_("Enable the auto deletion of mapped objects in chef-server through foreman-proxy (currently node and client upon host deletion)"), true),
+          self.set('auto_deletion', N_("Enable the auto deletion of mapped objects in chef-server through foreman-proxy (currently node and client upon host deletion, client on host rebuild)"), true),
+          self.set('validation_bootstrap_method', N_("Use validation.pem or create client directly storing private key in Foreman DB)"), true),
       ].each { |s| self.create! s.update(:category => "Setting::ForemanChef")}
     end
 

data/app/services/foreman_chef/object_exists_exception.rb

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

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

@@ -1,12 +1,17 @@
+<% if validation_bootstrap_method? -%>
 echo "Creating validation.pem"
 mkdir /etc/chef
 touch /etc/chef/validation.pem
 chmod 600 /etc/chef/validation.pem
 
-## You need to paste here foreman's private key
 cat << 'EOF' > /etc/chef/validation.pem
 <%= @host.params['chef_validation_private_key'] %>
 EOF
+<% else -%>
+cat << 'EOF' > /etc/chef/client.pem
+<%= @host.chef_private_key %>
+EOF
+<% end -%>
 
 ## If chef_server_certificate is present, install it into /etc/chef/trusted_certs
 <% chef_server_certificate = @host.params['chef_server_certificate'] -%>

data/app/views/foreman_chef/environments/index.html.erb

@@ -7,7 +7,7 @@
                                                                         {:class => 'btn btn-default', :"data-no-turbolink" => true})
                                            end.flatten)
    ) %>
-<% title_actions button_group(display_link_if_authorized(_('New Chef Environment'), hash_for_new_foreman_chef_environment_path)) %>
+<% title_actions button_group(new_link(_('New Chef Environment'))) %>
 
 <table class="table table-bordered table-striped">
   <tr>

data/db/migrate/20150916141657_create_chef_environment.rb

@@ -2,7 +2,7 @@ class CreateChefEnvironment < ActiveRecord::Migration
   def up
     create_table :foreman_chef_environments do |t|
       t.string :name, :default => '', :null => false
-      t.text :description, :default => ''
+      t.text :description
       t.integer :chef_proxy_id, :null => false
       t.timestamps
     end

data/db/migrate/20160408091653_add_chef_private_key_to_host.rb

@@ -0,0 +1,5 @@
+class AddChefPrivateKeyToHost < ActiveRecord::Migration
+  def change
+    add_column :hosts, :chef_private_key, :text
+  end
+end

data/lib/foreman_chef/engine.rb

@@ -45,10 +45,10 @@ module ForemanChef
       ForemanTasks.dynflow.config.eager_load_paths.concat(%W[#{ForemanChef::Engine.root}/app/lib/actions])
     end
 
-    initializer 'foreman_chef.register_plugin', :after => :finisher_hook do |app|
+    initializer 'foreman_chef.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.11'
-        allowed_template_helpers :chef_bootstrap
+        requires_foreman '>= 1.13'
+        allowed_template_helpers :chef_bootstrap, :validation_bootstrap_method?
 
         permission :import_chef_environments, { :environments => [:import, :synchronize] }, :resource_type => 'ForemanChef::Environment'
         permission :view_chef_environments, { :environments => [:index, :environments_for_chef_proxy] }, :resource_type => 'ForemanChef::Environment'
@@ -61,6 +61,9 @@ module ForemanChef
              caption: N_('Environments'),
              parent: :configure_menu,
              last: true
+
+        parameter_filter Host::Managed, :chef_private_key, :chef_proxy_id, :chef_environment_id
+        parameter_filter Hostgroup, :chef_proxy_id, :chef_environment_id
       end
     end
 
@@ -85,6 +88,7 @@ module ForemanChef
       ::Hostgroup.send :include, ForemanChef::Concerns::HostgroupExtensions
       ::SmartProxy.send :include, ForemanChef::Concerns::SmartProxyExtensions
       ::Host::Base.send :include, ForemanChef::Concerns::HostActionSubject
+      ::Host::Managed.send :include, ForemanChef::Concerns::HostBuild
       ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
       # Renderer Concern needs to be injected to controllers, ForemanRenderer was already included
       (TemplatesController.descendants + [TemplatesController]).each do |klass|

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -29,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.9
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
@@ -39,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.9
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
@@ -70,14 +64,18 @@ files:
 - Rakefile
 - app/assets/javascripts/foreman_chef/chef_proxy_environment_refresh.js
 - app/controllers/foreman_chef/application_controller.rb
+- app/controllers/foreman_chef/concerns/environment_parameters.rb
 - app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb
 - app/controllers/foreman_chef/environments_controller.rb
 - app/helpers/foreman_chef/chef_proxy_form.rb
+- app/lib/actions/foreman_chef/client/create.rb
 - app/lib/actions/foreman_chef/client/destroy.rb
+- app/lib/actions/foreman_chef/host/create.rb
 - app/lib/actions/foreman_chef/host/destroy.rb
 - app/lib/proxy_api/foreman_chef/chef_proxy.rb
 - app/models/foreman_chef/concerns/host_action_subject.rb
 - app/models/foreman_chef/concerns/host_and_hostgroup_extensions.rb
+- app/models/foreman_chef/concerns/host_build.rb
 - app/models/foreman_chef/concerns/host_extensions.rb
 - app/models/foreman_chef/concerns/hostgroup_extensions.rb
 - app/models/foreman_chef/concerns/renderer.rb
@@ -89,6 +87,7 @@ files:
 - app/models/setting/foreman_chef.rb
 - app/overrides/add_chef_proxy.rb
 - app/services/foreman_chef/chef_server_importer.rb
+- app/services/foreman_chef/object_exists_exception.rb
 - app/services/foreman_chef/proxy_exception.rb
 - app/views/foreman/unattended/snippets/_chef_client_bootstrap.erb
 - app/views/foreman/unattended/snippets/_chef_client_gem_bootstrap.erb
@@ -103,6 +102,7 @@ files:
 - db/migrate/20140220145827_add_chef_proxy_id_to_host.rb
 - db/migrate/20140513144804_add_chef_proxy_id_to_hostgroup.rb
 - db/migrate/20150916141657_create_chef_environment.rb
+- db/migrate/20160408091653_add_chef_private_key_to_host.rb
 - db/seeds.rb
 - lib/foreman_chef.rb
 - lib/foreman_chef/engine.rb