foreman_salt 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b22fef4003be237f6ba02e594fa8d583bc218f
-  data.tar.gz: e30d40a831982a5c5f07c645ea8936b5be3ab2da
+  metadata.gz: 53e9c60ec9d9ffcbadae6c71eae62c4e545bd20f
+  data.tar.gz: 6dd19160007e09f75ed43082ebc446c848a260dd
 SHA512:
-  metadata.gz: 2bbb4d5db09be8cc76f57375e61207e0f2a9758bd6ed7f6140234af2a34ec608329180f3001ff5ab7ee712b77b5e43ee1313629c33f0eb74c5fd091782238de1
-  data.tar.gz: 51751be171370526cc4deace259268e790707084eef0f3bc88e17e2d74797b8702e86c808af8355f56a0e043f9f87193b7c39e4896fbd496a962948728e5359a
+  metadata.gz: 5553e760b7ba4c5ccbcb4694818f2cee361cb4bfa26717817aed8e1ae016d3b01207336745bf899f394e69fc2cc5d66f3ae0c27423d44d23ba183b0aaab64490
+  data.tar.gz: f4a10ec1a21cddb8134961584baca1ba768fd75f51c30a9ed9b94a28965e854fd3b660ae189eeab7b098374681c255ffb90c7385b22c2b344e3f45acf12dee94

data/app/controllers/foreman_salt/api/v2/salt_minions_controller.rb

@@ -28,7 +28,7 @@ module ForemanSalt
         param :id, :identifier_dottable, :required => true
         param_group :minion
         def update
-          params[:minion][:salt_module_ids] = params[:minion].delete(:salt_state_ids)
+          params[:minion][:salt_module_ids] = params[:minion].delete(:salt_state_ids) if params[:minion]
           process_response @salt_minion.update_attributes(params[:minion])
         end
 

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -20,17 +20,16 @@ module ForemanSalt
         scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
 
         validate :salt_modules_in_host_environment
+
+        after_build      :delete_salt_key, :if => ->(host) { host.salt_proxy }
+        before_provision :accept_salt_key, :if => ->(host) { host.salt_proxy }
+        before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
       end
 
       def configuration_with_salt?
         configuration_without_salt? || !!salt_proxy
       end
 
-      def handle_salt
-        return true unless salt?
-        set_salt_autosign
-      end
-
       def params_with_salt_proxy
         params = params_without_salt_proxy
         params['salt_master'] = salt_master unless salt_master.blank?
@@ -82,6 +81,25 @@ module ForemanSalt
           errors.add(:base, _('Host must have an environment in order to set salt states'))
         end
       end
+
+      private
+
+      def accept_salt_key
+        begin
+          Rails.logger.info("Host #{fqdn} is built, accepting Salt key")
+          ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn).accept
+        rescue Foreman::Exception => e
+           Rails.logger.warn("Unable to accept key for #{fqdn}: #{e}")
+        end
+      end
+
+      def delete_salt_key
+        begin
+          ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn).delete
+        rescue Foreman::Exception => e
+         Rails.logger.warn("Unable to delete key for #{fqdn}: #{e}")
+        end
+      end
     end
   end
 end

data/lib/foreman_salt/extensions.rb

@@ -8,11 +8,9 @@ begin
 
   # Model Extensions
   ::Host::Managed.send :include, ForemanSalt::Concerns::HostManagedExtensions
-  ::Host::Managed.send :include, ForemanSalt::Concerns::Orchestration::Salt
   ::Hostgroup.send :include, ForemanSalt::Concerns::HostgroupExtensions
 
   # Controller Extensions
-  ::UnattendedController.send :include, ForemanSalt::Concerns::UnattendedControllerExtensions
   ::HostsController.send :include, ForemanSalt::Concerns::HostsControllerExtensions
   ::HostgroupsController.send :include, ForemanSalt::Concerns::HostgroupsControllerExtensions
 rescue => e

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/test/unit/host_extensions_test.rb

@@ -51,5 +51,24 @@ module ForemanSalt
       host.salt_proxy = proxy
       assert host.configuration?
     end
+
+    context 'key handling' do
+      before do
+        @host = FactoryGirl.create(:host, :with_salt_proxy, :build => true)
+        @key_stub = stub("key")
+        ForemanSalt::SmartProxies::SaltKeys.expects(:find).with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
+      end
+
+      test 'host key is accepted when host is built' do
+        @key_stub.expects(:accept).returns(true)
+        assert @host.built
+        @host.run_callbacks(:commit) # callbacks don't run with Foreman's transactional fixtures
+      end
+
+      test 'host key is deleted when host is removed' do
+        @key_stub.expects(:delete).returns(true)
+        assert @host.destroy
+      end
+    end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 description: Foreman Plug-in for Salt
@@ -59,7 +59,6 @@ files:
 - app/controllers/foreman_salt/application_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
-- app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
 - app/controllers/foreman_salt/minions_controller.rb
 - app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
@@ -74,7 +73,6 @@ files:
 - app/lib/proxy_api/salt.rb
 - app/models/foreman_salt/concerns/host_managed_extensions.rb
 - app/models/foreman_salt/concerns/hostgroup_extensions.rb
-- app/models/foreman_salt/concerns/orchestration/salt.rb
 - app/models/foreman_salt/fact_name.rb
 - app/models/foreman_salt/host_salt_module.rb
 - app/models/foreman_salt/hostgroup_salt_module.rb
@@ -172,17 +170,17 @@ 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.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt

data/app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb

@@ -1,18 +0,0 @@
-module ForemanSalt
-  module Concerns
-    module UnattendedControllerExtensions
-      extend ActiveSupport::Concern
-
-      included do
-        before_filter :handle_salt, :only => [:provision]
-      end
-
-      private
-
-      def handle_salt
-        return true if @spoof
-        render(:text => _('Failed to set autosign for host. Terminating the build!'), :status => 500) unless @host.respond_to?(:handle_salt) && @host.handle_salt
-      end
-    end
-  end
-end

data/app/models/foreman_salt/concerns/orchestration/salt.rb

@@ -1,75 +0,0 @@
-module ForemanSalt
-  module Concerns
-    module Orchestration
-      module Salt
-        extend ActiveSupport::Concern
-        include ::Orchestration
-
-        included do
-          after_validation :queue_salt_autosign
-          before_destroy :queue_salt_destroy
-        end
-
-        def salt?
-          name.present? && salt_proxy.present?
-        end
-
-        def initialize_salt
-          @salt_api ||= ProxyAPI::Salt.new :url => salt_proxy.url
-        end
-
-        def queue_salt_autosign
-          return unless salt? && errors.empty?
-          new_record? ? queue_set_salt_autosign : queue_update_salt_autosign
-        end
-
-        def queue_set_salt_autosign
-          # do nothing - we'll set autosign at the last second: when a host requests a provision URL
-        end
-
-        def queue_update_salt_autosign
-          # Host has been built --> remove auto sign
-          if old.build? && !build?
-            queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
-          end
-        end
-
-        def queue_salt_destroy
-          return unless salt? && errors.empty?
-          queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
-          queue.create(:name => _('Delete existing salt key for %s') % self, :priority => 50, :action => [self, :del_salt_key])
-        end
-
-        def queue_del_salt_autosign
-          return unless salt? && errors.empty?
-          queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
-        end
-
-        def set_salt_autosign
-          logger.info "Create autosign entry for #{name}"
-          initialize_salt
-          del_salt_key # if there's already an existing key
-          @salt_api.autosign_create name
-        rescue => e
-          failure _("Failed to create %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
-        end
-
-        def del_salt_autosign
-          logger.info "Remove autosign entry for #{name}"
-          initialize_salt
-          @salt_api.autosign_remove name
-        rescue => e
-          failure _("Failed to remove %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
-        end
-
-        def del_salt_key
-          logger.info "Delete salt key for #{name}"
-          initialize_salt
-          @salt_api.key_delete name
-        rescue => e
-          failure _("Failed to delete %{name}'s Salt key: %{e}") % { :name => name, :e => e }
-        end
-      end
-    end
-  end
-end