foreman_salt 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1deeaa0c9971036275b4c0b59404c258ab26be
-  data.tar.gz: acb1e0a6e10ae02fef2e3cde3fee083c550a7508
+  metadata.gz: 3958e07e3ba51a52ed71666da0a710088a5f33f6
+  data.tar.gz: df6214da1df13e4ec5eea3026c5237528d88deea
 SHA512:
-  metadata.gz: a781befa2ac30a6e82d1bc097627abea7c0de68fd75c27415a4e70b884f4325c3ecb585562098a44726f4cfdd6109b8aca3b7e49f8cbca452627f47cba06f8eb
-  data.tar.gz: 08cce306491c15a39112ecdc4515bfddb5e26f38e7aab4bfef4667062d1c63ebc7d71213f9a123ecd66a0693335919129dadc7418d7935bb8485d8ee52988d6d
+  metadata.gz: 7d6dc7e5d6b97d0fc09ebc34df7d6172ceab5e052d779ec907fca754fd6edea1ce82df6e5c56a135dc7db91147b4953aa643b4afec3ab05dd4b1dd59b29c04d0
+  data.tar.gz: b30c5d22dfd590fc398f26893ba1910452e9fc21b0fceca6974217c24fc58cb57142c0b586fd832ceedaeec9115f9553a5c4c88a8203662d2b8a9e39d6eb8250

data/README.md

@@ -2,6 +2,13 @@
 
 This plug-in adds support for Salt to Foreman. 
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| >= 1.6          | ~> 0.0         |
+| >= 1.7          | ~> 1.0         |
+
 ## Documentation
 
 More info is available in the Wiki https://github.com/theforeman/foreman_salt/wiki

data/app/controllers/foreman_salt/application_controller.rb

@@ -0,0 +1,8 @@
+module ForemanSalt
+  class ApplicationController < ::ApplicationController
+
+    def resource_class
+      "ForemanSalt::#{controller_name.singularize.classify}".constantize
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        alias_method :find_by_name_salt, :find_by_name
-        before_filter :find_by_name_salt, :only => [:saltrun]
+        alias_method :find_resource_salt, :find_resource
+        before_filter :find_resource_salt, :only => [:saltrun]
         alias_method_chain :action_permission, :salt_run
         alias_method_chain :load_vars_for_ajax, :salt_modules
         alias_method_chain :process_hostgroup, :salt_modules
@@ -22,7 +22,7 @@ module ForemanSalt
 
       def salt_external_node
         begin
-          @host = resource_base.find_by_name(params[:name])
+          @host = resource_base.find(params[:name])
           enc = {}
           env = @host.salt_environment.blank? ? 'base' : @host.salt_environment.name
           enc["classes"] = @host.salt_modules.any? ? @host.salt_modules.map(&:name) : []

data/app/controllers/foreman_salt/salt_autosign_controller.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class SaltAutosignController < ::ApplicationController
+  class SaltAutosignController < ApplicationController
 
     def index
       setup

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -1,8 +1,8 @@
 module ForemanSalt
-  class SaltEnvironmentsController < ::ApplicationController
+  class SaltEnvironmentsController < ApplicationController
     include Foreman::Controller::AutoCompleteSearch
 
-    before_filter :find_by_name, :only => [:edit, :update, :destroy]
+    before_filter :find_resource, :only => [:edit, :update, :destroy]
 
     def index
       @salt_environments = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])

data/app/controllers/foreman_salt/salt_keys_controller.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class SaltKeysController < ::ApplicationController
+  class SaltKeysController < ApplicationController
 
     def index
       @proxy = find_proxy

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -1,8 +1,8 @@
 module ForemanSalt
-  class SaltModulesController < ::ApplicationController
+  class SaltModulesController < ApplicationController
     include Foreman::Controller::AutoCompleteSearch
 
-    before_filter :find_by_name, :only => [:edit, :update, :destroy]
+    before_filter :find_resource, :only => [:edit, :update, :destroy]
 
     def index
       @salt_modules = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])

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

@@ -0,0 +1,67 @@
+module ForemanSalt
+  module Concerns
+    module HostManagedExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule", :join_table => "hosts_salt_modules", :foreign_key => "host_id"
+        belongs_to :salt_proxy, :class_name => "SmartProxy"
+        belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
+        alias_method_chain :params, :salt_proxy
+        alias_method_chain :set_hostgroup_defaults, :salt_proxy
+        alias_method_chain :smart_proxy_ids, :salt_proxy
+      end
+
+      def handle_salt
+        return true unless salt?
+        salt_autosign_create
+      end
+
+      def params_with_salt_proxy
+        params = params_without_salt_proxy
+        params["salt_master"] = salt_master unless salt_master.blank?
+        params
+      end
+
+      def salt_modules
+        return super unless hostgroup
+        [super + hostgroup.salt_modules].flatten
+      end
+
+      def salt_module_ids
+        return super unless hostgroup
+        [super + hostgroup.salt_module_ids].flatten
+      end
+
+      def salt_master
+        salt_proxy.to_s
+      end
+
+      def saltrun!
+        unless salt_proxy.present?
+          errors.add(:base, _("No Salt master defined - can't continue"))
+          logger.warn "Unable to execute salt run, no salt proxies defined"
+          return false
+        end
+        ProxyAPI::Salt.new({:url => salt_proxy.url}).highstate name
+      rescue => e
+        errors.add(:base, _("Failed to execute state.highstate: %s") % e)
+        false
+      end
+
+      def set_hostgroup_defaults_with_salt_proxy
+         return unless hostgroup
+         assign_hostgroup_attributes(%w{salt_proxy_id})
+         set_hostgroup_defaults_without_salt_proxy
+      end
+
+      def smart_proxy_ids_with_salt_proxy
+        ids = smart_proxy_ids_without_salt_proxy
+        [salt_proxy, hostgroup.try(:salt_proxy)].compact.each do |proxy|
+          ids << proxy.id
+        end
+        ids
+      end
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+module ForemanSalt
+  module Concerns
+    module HostgroupExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule"
+        belongs_to :salt_proxy, :class_name => "SmartProxy"
+        belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
+      end
+
+      def salt_modules
+        return super unless ancestry.present?
+        ([super] + [inherited_salt_modules]).flatten.uniq.compact
+      end
+
+      def salt_module_ids
+        return super unless ancestry.present?
+        ([super] + [inherited_salt_module_ids]).flatten.uniq.compact
+      end
+
+      def inherited_salt_modules
+        ForemanSalt::SaltModule.where(:id => inherited_salt_module_ids)
+      end
+
+      def inherited_salt_module_ids
+        if ancestry.present?
+          self.class.sort_by_ancestry(ancestors.reject { |ancestor| ancestor.salt_module_ids.empty? }).last.try(:salt_modules)
+        else
+          []
+        end
+      end
+
+      def salt_proxy
+        return super unless ancestry.present?
+        SmartProxy.find_by_id(inherited_salt_proxy_id)
+      end
+
+      def inherited_salt_proxy_id
+        if ancestry.present?
+          read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where("salt_proxy_id is not NULL")).last.try(:salt_proxy_id)
+        else
+          self.salt_proxy_id
+        end
+      end
+
+      def salt_environment
+        return super unless ancestry.present?
+        ForemanSalt::SaltEnvironment.find_by_id(inherited_salt_environment_id)
+      end
+
+      def inherited_salt_environment_id
+        if ancestry.present?
+          read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where("salt_environment_id is not NULL")).last.try(:salt_environment_id)
+        else
+          self.salt_environment_id
+        end
+      end
+
+      def salt_master
+        salt_proxy.to_s
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+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_salt_autosign_create : queue_salt_autosign_update
+        end
+
+        def queue_salt_autosign_create
+          # do nothing - we'll set autosign at the last second: when a host requests a provision URL
+        end
+
+        def queue_salt_autosign_update
+          # Host has been built --> remove auto sign
+          if old.build? and !build?
+            queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
+          end
+        end
+
+        def queue_salt_destroy
+          return unless salt? && errors.empty?
+          queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
+          queue.create(:name => _("Delete existing salt key for %s") % self, :priority => 50, :action => [self, :salt_key_delete])
+        end
+
+        def queue_salt_autosign_remove
+          return unless salt? && errors.empty?
+          queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
+        end
+
+        def salt_autosign_create
+          logger.info "Create autosign entry for #{name}"
+          initialize_salt
+          salt_key_delete # 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 salt_autosign_remove
+          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 salt_key_delete
+          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

data/app/views/foreman_salt/salt_keys/index.erb

@@ -1,4 +1,4 @@
-<% title _("Salt Keys on %s") % @proxy.name %>
+<% title _("Salt Keys on %s") % @proxy %>
 <% search_bar _("Filter %s") % salt_keys_state_filter %>
 
 <% title_actions display_link_if_authorized(_("Autosign"), hash_for_smart_proxy_salt_autosign_index_path) %>

data/db/seeds.d/75-salt-seeds.rb

@@ -1,31 +1,11 @@
 # Create feature for Smart Proxy
 Feature.find_or_create_by_name("Salt")
 
-# Seed our permissions
-permissions = [
-  %w(Host saltrun_hosts),
-  %w(Host view_hosts),
-  %w(ForemanSalt::SaltModule create_salt_modules),
-  %w(ForemanSalt::SaltModule view_salt_modules),
-  %w(ForemanSalt::SaltModule edit_salt_modules),
-  %w(ForemanSalt::SaltModule destroy_salt_modules),
-  %w(SmartProxy view_smart_proxies_salt_keys),
-  %w(SmartProxy destroy_smart_proxies_salt_keys),
-  %w(SmartProxy edit_smart_proxies_salt_keys),
-  %w(SmartProxy destroy_smart_proxies_salt_autosign),
-  %w(SmartProxy create_smart_proxies_salt_autosign),
-  %w(SmartProxy view_smart_proxies_salt_autosign),
-]
-
-permissions.each do |resource, permission|
-  Permission.find_or_create_by_resource_type_and_name resource, permission
-end
-
 # Add new viewing permissions to Viewer role
 viewer = Role.find_by_name('Viewer')
 
 if viewer
-  [:view_smart_proxies_salt_keys, :view_smart_proxies_salt_autosign, :view_salt_modules].each do |permission|
-    viewer.add_permissions!([permission]) unless viewer.permissions.include? Permission.find_by_name(permission)
+  Permission.where(:name => [:view_smart_proxies_salt_keys, :view_smart_proxies_salt_autosign, :view_salt_modules]).each do |permission|
+    viewer.add_permissions!([permission.name]) unless viewer.permissions.include? permission
   end
 end

data/lib/foreman_salt/engine.rb

@@ -17,7 +17,7 @@ module ForemanSalt
 
     initializer 'foreman_salt.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_salt do
-        requires_foreman '>= 1.6'
+        requires_foreman '>= 1.7'
 
         menu :top_menu, :salt_environments,
           :url_hash => {:controller => :'foreman_salt/salt_environments', :action => :index },
@@ -84,7 +84,7 @@ module ForemanSalt
 
         # Model Extensions
         ::Host::Managed.send :include, ForemanSalt::Concerns::HostManagedExtensions
-        ::Host::Managed.send :include, ForemanSalt::Orchestration::Salt
+        ::Host::Managed.send :include, ForemanSalt::Concerns::Orchestration::Salt
         ::Hostgroup.send :include, ForemanSalt::Concerns::HostgroupExtensions
 
         # Controller Extensions

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

data/lib/tasks/foreman_salt_tasks.rake

@@ -24,7 +24,7 @@ Rake::Task[:test].enhance do
 end
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:setup')
+if Rake::Task.task_defined?(:'jenkins:unit')
   Rake::Task["jenkins:unit"].enhance do
     Rake::Task['test:foreman_salt'].invoke
   end

data/test/factories/foreman_salt_factories.rb

@@ -1,14 +1,9 @@
 FactoryGirl.define do
-  factory :smart_proxy, :class => "::SmartProxy" do
-    sequence(:name) { |n| "proxy#{n}" }
-    sequence(:url)  { |n| "http://proxy#{n}.example.com:9090" }
-
-    trait :with_salt_feature do
-      features        { [::Feature.find_or_create_by_name('Salt')] }
-    end
+  factory :salt_module, :class => "ForemanSalt::SaltModule" do
+    sequence(:name) { |n| "module#{n}" }
   end
 
-  factory :salt_module, :class => "ForemanSalt::SaltModule" do
+  factory :salt_environment, :class => "ForemanSalt::SaltEnvironment" do
     sequence(:name) { |n| "module#{n}" }
   end
 end
@@ -29,4 +24,10 @@ FactoryGirl.modify do
       salt_modules { FactoryGirl.create_list :salt_module, 10 }
     end
   end
+
+  factory :smart_proxy do
+    trait :with_salt_feature do
+      features        { [::Feature.find_or_create_by_name('Salt')] }
+    end
+  end
 end

data/test/functional/hosts_controller_test.rb

@@ -6,7 +6,6 @@ class HostsControllerTest < ActionController::TestCase
     Setting[:restrict_registered_puppetmasters] = true
     Setting[:require_ssl_puppetmasters] = false
 
-
     proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
     Resolv.any_instance.stubs(:getnames).returns([proxy.to_s])
 

data/test/integration/salt_autosign_test.rb

@@ -17,7 +17,7 @@ module ForemanSalt
     test "index page" do
       visit smart_proxy_salt_autosign_index_path(:smart_proxy_id => @proxy.id)
       assert find_link('Keys').visible?, "Keys is not visible"
-      assert has_content?("Autosign entries for #{@proxy.name}"), "Page title does not appear"
+      assert has_content?("Autosign entries for #{@proxy.hostname}"), "Page title does not appear"
       assert has_content?("Displaying"), "Pagination 'Display ...' does not appear"
     end
 

data/test/integration/salt_keys_test.rb

@@ -22,7 +22,7 @@ module ForemanSalt
     test "index page" do
       visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
       assert find_link('Autosign').visible?, "Autosign is not visible"
-      assert has_content?("Salt Keys on #{@proxy.name}"), "Page title does not appear"
+      assert has_content?("Salt Keys on #{@proxy.hostname}"), "Page title does not appear"
       assert has_content?("Displaying"), "Pagination 'Display ...' does not appear"
     end
 

data/test/unit/salt_keys_test.rb

@@ -4,6 +4,9 @@ class SaltKeysTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login "admin"
 
+    # Fix for 1.8.7 OpenStruct http://stackoverflow.com/questions/9079441/populate-select-tag-ruby-rails
+    OpenStruct.__send__(:define_method, :id) { @table[:id] }
+
     @proxy = OpenStruct.new(:id => 1, :url => 'http://dummy.example.com:9090')
 
     ProxyAPI::Salt.any_instance.stubs(:key_list).returns(

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com
@@ -54,12 +54,13 @@ files:
 - app/services/foreman_salt/smart_proxies/salt_keys.rb
 - app/services/foreman_salt/fact_importer.rb
 - app/models/foreman_salt/salt_module.rb
+- app/models/foreman_salt/concerns/hostgroup_extensions.rb
+- app/models/foreman_salt/concerns/host_managed_extensions.rb
+- app/models/foreman_salt/concerns/orchestration/salt.rb
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/fact_name.rb
-- app/models/concerns/foreman_salt/hostgroup_extensions.rb
-- app/models/concerns/foreman_salt/host_managed_extensions.rb
-- app/models/concerns/foreman_salt/orchestration/salt.rb
 - app/controllers/foreman_salt/salt_modules_controller.rb
+- app/controllers/foreman_salt/application_controller.rb
 - app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_keys_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb

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

@@ -1,65 +0,0 @@
-module ForemanSalt
-  module HostManagedExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule", :join_table => "hosts_salt_modules", :foreign_key => "host_id"
-      belongs_to :salt_proxy, :class_name => "SmartProxy"
-      belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
-      alias_method_chain :params, :salt_proxy
-      alias_method_chain :set_hostgroup_defaults, :salt_proxy
-      alias_method_chain :smart_proxy_ids, :salt_proxy
-    end
-
-    def handle_salt
-      return true unless salt?
-      salt_autosign_create
-    end
-
-    def params_with_salt_proxy
-      params = params_without_salt_proxy
-      params["salt_master"] = salt_master unless salt_master.blank?
-      params
-    end
-
-    def salt_modules
-      return super unless hostgroup
-      [super + hostgroup.salt_modules].flatten
-    end
-
-    def salt_module_ids
-      return super unless hostgroup
-      [super + hostgroup.salt_module_ids].flatten
-    end
-
-    def salt_master
-      salt_proxy.to_s
-    end
-
-    def saltrun!
-      unless salt_proxy.present?
-        errors.add(:base, _("No Salt master defined - can't continue"))
-        logger.warn "Unable to execute salt run, no salt proxies defined"
-        return false
-      end
-      ProxyAPI::Salt.new({:url => salt_proxy.url}).highstate name
-    rescue => e
-      errors.add(:base, _("Failed to execute state.highstate: %s") % e)
-      false
-    end
-
-    def set_hostgroup_defaults_with_salt_proxy
-       return unless hostgroup
-       assign_hostgroup_attributes(%w{salt_proxy_id})
-       set_hostgroup_defaults_without_salt_proxy
-    end
-
-    def smart_proxy_ids_with_salt_proxy
-      ids = smart_proxy_ids_without_salt_proxy
-      [salt_proxy, hostgroup.try(:salt_proxy)].compact.each do |proxy|
-        ids << proxy.id
-      end
-      ids
-    end
-  end
-end

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

@@ -1,63 +0,0 @@
-module ForemanSalt
-  module HostgroupExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule"
-      belongs_to :salt_proxy, :class_name => "SmartProxy"
-      belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
-    end
-
-    def salt_modules
-      return super unless ancestry.present?
-      ([super] + [inherited_salt_modules]).flatten.uniq.compact
-    end
-
-    def salt_module_ids
-      return super unless ancestry.present?
-      ([super] + [inherited_salt_module_ids]).flatten.uniq.compact
-    end
-
-    def inherited_salt_modules
-      ForemanSalt::SaltModule.where(:id => inherited_salt_module_ids)
-    end
-
-    def inherited_salt_module_ids
-      if ancestry.present?
-        self.class.sort_by_ancestry(ancestors.reject { |ancestor| ancestor.salt_module_ids.empty? }).last.try(:salt_modules)
-      else
-        []
-      end
-    end
-
-    def salt_proxy
-      return super unless ancestry.present?
-      SmartProxy.find_by_id(inherited_salt_proxy_id)
-    end
-
-    def inherited_salt_proxy_id
-      if ancestry.present?
-        read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where("salt_proxy_id is not NULL")).last.try(:salt_proxy_id)
-      else
-        self.salt_proxy_id
-      end
-    end
-
-    def salt_environment
-      return super unless ancestry.present?
-      ForemanSalt::SaltEnvironment.find_by_id(inherited_salt_environment_id)
-    end
-
-    def inherited_salt_environment_id
-      if ancestry.present?
-        read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where("salt_environment_id is not NULL")).last.try(:salt_environment_id)
-      else
-        self.salt_environment_id
-      end
-    end
-
-    def salt_master
-      salt_proxy.to_s
-    end
-  end
-end

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

@@ -1,73 +0,0 @@
-module ForemanSalt
-  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_salt_autosign_create : queue_salt_autosign_update
-      end
-
-      def queue_salt_autosign_create
-        # do nothing - we'll set autosign at the last second: when a host requests a provision URL
-      end
-
-      def queue_salt_autosign_update
-        # Host has been built --> remove auto sign
-        if old.build? and !build?
-          queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
-        end
-      end
-
-      def queue_salt_destroy
-        return unless salt? && errors.empty?
-        queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
-        queue.create(:name => _("Delete existing salt key for %s") % self, :priority => 50, :action => [self, :salt_key_delete])
-      end
-
-      def queue_salt_autosign_remove
-        return unless salt? && errors.empty?
-        queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
-      end
-
-      def salt_autosign_create
-        logger.info "Create autosign entry for #{name}"
-        initialize_salt
-        salt_key_delete # 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 salt_autosign_remove
-        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 salt_key_delete
-        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