foreman_salt 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2f3f97f7067977ffca23c926e798efc4a29d240d
-  data.tar.gz: e2f771a0dcf32c7077bb1ac66bd0521f7d784713
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDYxMGMzYTMxM2FjODk0NGY5YzU2YWFlYjZlZGIxOGM4OGMwYzQ1MQ==
+  data.tar.gz: !binary |-
+    ZWYxNGRiOWY2MmYxMjExNTJiYWM4N2ZlOTE3ZjBiZGJiNWIzOGExZg==
 SHA512:
-  metadata.gz: da42071ca83b47261517336c59ed9218d797169a3a4d142e36bfe6e423275bee81fca4d5f21886475b77ae79a182b695dad8e533c649e7fc16a6b5f0a0aaef03
-  data.tar.gz: 6b08a1effbccba43df1ea0721488ca8c28467468994f3b102bdbf14c8d8c6be14873710dfbe9a2d0e85623d8e3d211a90e9b4186390bc1e4094d744b65fad9c8
+  metadata.gz: !binary |-
+    YmU3NjEwNzA3NWMwOWQ0MDBhYTljOWMxOWZjNzliMTJlODc4NzRlOWVlN2Q5
+    ZWY4MGNiNjlmNWNlNGMxNWVmYjU0YmQ1YjkyODhjYTY2YzM2ODIxYjNkYjc2
+    MGQwNzI0NTFjNGUzZDQxOWU2YWQzZWQ1ZDgwZjJkNmYxN2MyMWQ=
+  data.tar.gz: !binary |-
+    NDA2MDM3Y2ZiMzE5NzUwOWMwY2QyYmE4YzFmY2YzNDIyYmE2NzM4YjM0ODc3
+    NGE0MDdjMGJjYzA2MWIzOTg3NzRhNGUyMTdlZWVmN2M1ODAyYTAyZDY5YjM3
+    NGI2NGI2MjZmYzA5NGU2ZTQ4NTA4YzgxYmJlMjI5Y2I2ODBlMTM=

data/app/assets/javascripts/foreman_salt/states.js

@@ -0,0 +1,33 @@
+$(document).on( "ContentLoad", function() {
+  update_salt_states($('#host_salt_environment_id'));
+});
+
+function update_salt_states(element) {
+  var host_id = $("form").data('id')
+  var env_id = $('*[id*=salt_environment_id]').val();
+  var url = $(element).attr('data-url');
+  var data = $("form").serialize().replace('method=put', 'method=post');
+
+  if (url.match('hostgroups')) {
+    data = data + '&hostgroup_id=' + host_id
+  } else {
+    data = data + '&host_id=' + host_id
+  }
+
+  if (env_id == "") return;
+
+  $(element).indicator_show();
+  $.ajax({
+    type: 'post',
+    url:  url,
+    data: data,
+    success: function(request) {
+      $('#salt_modules').html(request);
+      $('[rel="twipsy"]').tooltip();
+      multiSelectOnLoad();
+    },
+    complete: function() {
+      $(element).indicator_hide();
+    }
+  });
+}

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

@@ -2,11 +2,22 @@ module ForemanSalt
   module Api
     module V2
       class SaltStatesController < ::ForemanSalt::Api::V2::BaseController
-        before_filter :find_resource, :except => [:index, :create]
+        include StateImporter
+
+        before_filter :find_resource, :except => [:index, :create, :import]
+        before_filter :find_proxy, :only => :import
+        before_filter :find_environment, :only => :index
 
         api :GET, '/salt_states', N_('List all Salt states')
+        param :salt_environment_id, :identifier_dottable, :required => false, :desc => N_('Limit to a specific environment')
         def index
-          @salt_states = resource_scope_for_index
+          if @salt_environment
+            @salt_states = resource_scope_for_index.joins(:salt_environments).where('salt_module_environments.salt_environment_id' => @salt_environment)
+          else
+            @salt_states = resource_scope_for_index
+          end
+
+          @subtotal = @salt_states.count
         end
 
         api :GET, '/salt_states/:id/', N_('Show a state')
@@ -33,6 +44,28 @@ module ForemanSalt
           process_response @salt_state.destroy
         end
 
+        api :POST, '/salt_states/import/:smart_proxy_id', N_('Import states from a salt master')
+        param :smart_proxy_id, :identifier_dottable, :required => true, :desc => N_('Salt Smart Proxy ID')
+        param :salt_environment_ids, Array, :required => false, :desc => N_('Limit to a specific environments')
+        param :actions, Array, :required => false, :desc => N_('Limit to specific actions: i.e. add, remove')
+        param :dryrun, :bool, :required => false, :desc => N_('Dryrun only')
+        def import
+          states = fetch_states_from_proxy(@proxy, params[:salt_environment_ids])
+          unless params[:dryrun]
+            states[:changes].each do |environment, state|
+              if state[:add].any? && (params[:actions].blank? || params[:actions].include?('add'))
+                add_to_environment(state[:add], environment)
+              end
+
+              if state[:remove].any? && (params[:actions].blank? || params[:actions].include?('remove'))
+                remove_from_environment(state[:remove], environment)
+              end
+            end
+            clean_orphans
+          end
+          render :text => states.to_json
+        end
+
         def controller_permission
           'salt_modules'
         end
@@ -40,6 +73,24 @@ module ForemanSalt
         def resource_class
           ForemanSalt::SaltModule
         end
+
+        def action_permission
+          case params[:action]
+          when 'import'
+            :import
+          else
+            super
+          end
+        end
+
+        private
+
+        def find_environment
+          if params[:salt_environment_id]
+            @salt_environment = ForemanSalt::SaltEnvironment.find(params[:salt_environment_id])
+            fail _('Could not find salt environment with id %s') % params[:salt_environment_id] unless @salt_environment
+          end
+        end
       end
     end
   end

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

@@ -7,12 +7,33 @@ module ForemanSalt
         alias_method_chain :load_vars_for_ajax, :salt_modules
       end
 
+      def salt_environment_selected
+        @hostgroup = Hostgroup.authorized(:view_hostgroups, Hostgroup).find_by_id(params[:hostgroup_id]) || Hostgroup.new(params[:hostgroup])
+
+        if params[:hostgroup][:salt_environment_id].present?
+          @salt_environment = ::ForemanSalt::SaltEnvironment.find(params[:hostgroup][:salt_environment_id])
+          load_vars_for_ajax
+          render :partial => 'foreman_salt/salt_modules/host_tab_pane'
+        else
+          logger.info 'environment_id is required to render states'
+        end
+      end
+
       private
 
       def load_vars_for_ajax_with_salt_modules
         load_vars_for_ajax_without_salt_modules
-        @salt_modules =           @hostgroup.salt_modules
-        @inherited_salt_modules = @hostgroup.inherited_salt_modules
+        @obj = @hostgroup
+        @salt_environment ||= @hostgroup.salt_environment
+
+        if @salt_environment
+          @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @hostgroup.inherited_salt_modules)
+          @salt_modules           = @salt_environment.salt_modules - @inherited_salt_modules
+        else
+          @inherited_salt_modules = @salt_modules = []
+        end
+
+        @selected = @hostgroup.salt_modules || []
       end
     end
   end

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

@@ -13,7 +13,8 @@ module ForemanSalt
         return head(:not_found) unless @hostgroup
 
         @salt_modules           = @host.salt_modules if @host
-        @inherited_salt_modules = @hostgroup.salt_modules
+        @salt_environment       = @host.salt_environment if @host
+        @inherited_salt_modules = @hostgroup.all_salt_modules
         process_hostgroup_without_salt_modules
       end
 
@@ -21,8 +22,11 @@ module ForemanSalt
 
       def load_vars_for_ajax_with_salt_modules
         return unless @host
-        @salt_modules           = @host.salt_modules
-        @inherited_salt_modules = @host.hostgroup.salt_modules if @host.hostgroup
+        @obj                    = @host
+        @salt_environment       = @host.salt_environment if @host
+        @selected               = @host.salt_modules
+        @salt_modules           = @host.salt_environment ? @salt_environment.salt_modules : []
+        @inherited_salt_modules = @host.hostgroup.all_salt_modules if @host.hostgroup
         load_vars_for_ajax_without_salt_modules
       end
     end

data/app/controllers/foreman_salt/minions_controller.rb

@@ -8,7 +8,7 @@ module ForemanSalt
     def node
       enc = {}
       env = @minion.salt_environment.blank? ? 'base' : @minion.salt_environment.name
-      enc['classes'] = @minion.salt_modules.any? ? @minion.salt_modules.map(&:name) : []
+      enc['classes'] = @minion.salt_modules_for_enc
 
       pillars = @minion.info['parameters']
       enc['parameters'] = Setting[:salt_namespace_pillars] ? { 'foreman' => pillars } : pillars
@@ -32,12 +32,24 @@ module ForemanSalt
       redirect_to host_path(@minion)
     end
 
+    def salt_environment_selected
+      if params[:host][:salt_environment_id].present?
+        @salt_environment = ::ForemanSalt::SaltEnvironment.find(params[:host][:salt_environment_id])
+        load_ajax_vars
+        render :partial => 'foreman_salt/salt_modules/host_tab_pane'
+      else
+        logger.info 'environment_id is required to render states'
+      end
+    end
+
     def action_permission
       case params[:action]
         when 'run'
           :saltrun
         when 'node'
           :view
+        when 'salt_environment_selected'
+          :edit
         else
           super
       end
@@ -50,5 +62,25 @@ module ForemanSalt
     def resource_class
       Host
     end
+
+    private
+
+    def load_ajax_vars
+      @minion = Host::Base.authorized(:view_hosts, Host).find_by_id(params[:host_id])
+      if @minion
+        unless @minion.is_a?(Host::Managed)
+          @minion      = @host.becomes(Host::Managed)
+          @minion.type = 'Host::Managed'
+        end
+        @minion.attributes = params[:host]
+      else
+        @minion ||= Host::Managed.new(params[:host])
+      end
+
+      @obj = @minion
+      @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @minion.hostgroup ? @minion.hostgroup.all_salt_modules : [])
+      @salt_modules = @salt_environment.salt_modules - @inherited_salt_modules
+      @selected = @minion.salt_modules || []
+    end
   end
 end

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -1,11 +1,13 @@
 module ForemanSalt
   class SaltModulesController < ::ForemanSalt::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
+    include StateImporter
 
     before_filter :find_resource, :only => [:edit, :update, :destroy]
+    before_filter :find_proxy, :only => :import
 
     def index
-      @salt_modules = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+      @salt_modules = resource_base.search_for(params[:search], :order => params[:order]).includes(:salt_environments).paginate(:page => params[:page])
     end
 
     def new
@@ -23,6 +25,7 @@ module ForemanSalt
     end
 
     def edit
+      @salt_environments = @salt_module.salt_environments
     end
 
     def update
@@ -41,5 +44,46 @@ module ForemanSalt
         process_error
       end
     end
+
+    def action_permission
+      case params[:action]
+      when 'import'
+        :import
+      when 'apply_changes'
+        :import
+      else
+        super
+      end
+    end
+
+    def import
+      result = fetch_states_from_proxy(@proxy)
+      @changes = result[:changes]
+      @deletes = result[:deletes]
+
+      if @changes.empty?
+        notice _('No changes found')
+        redirect_to salt_modules_path
+      end
+    end
+
+    def apply_changes
+      if params[:changed].blank?
+        notice _('No changes found')
+        redirect_to salt_modules_path
+      else
+        params[:changed].each do |environment, states|
+          next unless states[:add] || states[:remove]
+          environment = SaltEnvironment.find_or_create_by_name(environment)
+
+          add_to_environment(JSON.load(states[:add]), environment) if states[:add]
+          remove_from_environment(JSON.load(states[:remove]), environment) if states[:remove]
+        end
+
+        clean_orphans
+        notice _('Successfully imported')
+        redirect_to salt_modules_path
+      end
+    end
   end
 end

data/app/controllers/foreman_salt/state_importer.rb

@@ -0,0 +1,72 @@
+module ForemanSalt
+  module StateImporter
+    extend ActiveSupport::Concern
+
+    private
+
+    def find_proxy
+      @proxy = SmartProxy.find(params[:proxy] || params[:smart_proxy_id])
+      return :not_found unless @proxy
+    end
+
+    def fetch_states_from_proxy(proxy, environments = nil)
+      result = { :changes => {},
+                 :deletes => [] }
+
+      new = ProxyAPI::Salt.new(:url => proxy.url).states_list
+      old = SaltModule.to_hash
+
+      environments ||= new.keys + old.keys
+
+      environments.each do |environment|
+        old_states = old[environment] || []
+        new_states = new[environment] || []
+
+        if old_states.any?
+          removed = old_states - new_states
+          added = new_states - old_states
+        else
+          added = new_states
+          removed = []
+        end
+
+        if added.any? || removed.any?
+          result[:changes][environment] = {}
+
+          unless removed.blank?
+            result[:changes][environment][:remove] = removed
+            result[:deletes] << environment if removed.count == old[environment].count && added.blank?
+          end
+
+          result[:changes][environment][:add] = added unless added.blank?
+        end
+      end
+
+      result
+    end
+
+    def add_to_environment(states, environment)
+      states.each do |state_name|
+        state = SaltModule.find_or_create_by_name(state_name)
+        state.salt_environments << SaltEnvironment.find(environment)
+      end
+    end
+
+    def remove_from_environment(states, environment)
+      states.each do |state_name|
+        state = SaltModule.find(state_name)
+        state.salt_environments.delete(environment) if state
+      end
+    end
+
+    def clean_orphans
+      SaltModule.all.each do |state|
+        state.destroy if state.salt_environments.empty?
+      end
+
+      SaltEnvironment.all.each do |environment|
+        environment.destroy if environment.salt_modules.empty?
+      end
+    end
+  end
+end

data/app/helpers/foreman_salt/salt_modules_helper.rb

@@ -0,0 +1,19 @@
+module ForemanSalt
+  module SaltModulesHelper
+    def import_from_proxies
+      links = SmartProxy.with_features('Salt').map do |proxy|
+        display_link_if_authorized(_('Import from %s') % proxy.name, hash_for_import_salt_modules_path.merge(:proxy => proxy), :class => 'btn btn-default')
+      end.flatten
+
+      select_action_button(_('Import'), {}, links)
+    end
+
+    def colorize(state)
+      # Make the state easier to read
+      combo = %w(2E9DB9 4D1D59 2C777E 1C4758 591D4B)
+      state.split('.').each_with_index.map do |section, index|
+        "<span style='color: ##{combo[index % 5]}; font-weight: bold;'>#{section}</span>"
+      end.join('.').html_safe
+    end
+  end
+end

data/app/lib/proxy_api/salt.rb

@@ -25,6 +25,24 @@ module ::ProxyAPI
       raise ProxyException.new(url, e, N_('Unable to delete Salt autosign for %s'), name)
     end
 
+    def environments_list
+      parse(get('environments'))
+    rescue => e
+      raise ProxyException.new(url, e, N_('Unable to fetch Salt environments list'))
+    end
+
+    def states_list
+      states = {}
+
+      environments_list.each do |environment|
+        states[environment] = parse(get("environments/#{environment}"))
+      end
+
+      states
+    rescue => e
+      raise ProxyException.new(url, e, N_('Unable to fetch Salt states list'))
+    end
+
     def key_list
       parse(get('key'))
     rescue => e

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

@@ -4,12 +4,20 @@ module ForemanSalt
       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'
+        has_many :salt_modules, :through => :host_salt_modules, :class_name => '::ForemanSalt::SaltModule'
+        has_many :host_salt_modules, :foreign_key => :host_id, :class_name => '::ForemanSalt::HostSaltModule'
+
         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
+
+        scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
+        scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
+
+        validate :salt_modules_in_host_environment
       end
 
       def handle_salt
@@ -23,14 +31,11 @@ module ForemanSalt
         params
       end
 
-      def salt_modules
-        return super unless hostgroup
-        [super + hostgroup.salt_modules].flatten
-      end
+      def salt_modules_for_enc
+        return [] unless self.salt_environment
 
-      def salt_module_ids
-        return super unless hostgroup
-        [super + hostgroup.salt_module_ids].flatten
+        hostgroup_modules = self.hostgroup ? self.hostgroup.all_salt_modules : []
+        self.salt_environment.salt_modules.where(:id => self.salt_modules + hostgroup_modules).pluck(:name)
       end
 
       def salt_master
@@ -62,6 +67,16 @@ module ForemanSalt
         end
         ids
       end
+
+      def salt_modules_in_host_environment
+        return unless self.salt_modules.any?
+
+        if self.salt_environment
+          errors.add(:base, _('Salt states must be in the environment of the host')) unless (self.salt_modules - self.salt_environment.salt_modules).empty?
+        else
+          errors.add(:base, _('Host must have an environment in order to set salt states'))
+        end
+      end
     end
   end
 end

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

@@ -4,19 +4,22 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        has_and_belongs_to_many :salt_modules, :class_name => 'ForemanSalt::SaltModule'
+        has_many :salt_modules, :through => :hostgroup_salt_modules, :class_name => '::ForemanSalt::SaltModule'
+        has_many :hostgroup_salt_modules, :class_name => '::ForemanSalt::HostgroupSaltModule'
+
         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
+        scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
+        scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
       end
 
-      def salt_module_ids
-        return super unless ancestry.present?
-        ([super] + [inherited_salt_module_ids]).flatten.uniq.compact
+      def all_salt_modules
+        if ancestry.present?
+          (self.salt_modules + self.inherited_salt_modules).uniq
+        else
+          self.salt_modules
+        end
       end
 
       def inherited_salt_modules
@@ -25,7 +28,7 @@ module ForemanSalt
 
       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)
+          self.class.sort_by_ancestry(ancestors.reject { |ancestor| ancestor.salt_module_ids.empty? }).map(&:salt_module_ids).inject(&:+).uniq
         else
           []
         end

data/app/models/foreman_salt/host_salt_module.rb

@@ -0,0 +1,6 @@
+module ForemanSalt
+  class HostSaltModule < ActiveRecord::Base
+    belongs_to :host, :class_name => "Host::Managed", :foreign_key => :host_id
+    belongs_to :salt_module
+  end
+end

data/app/models/foreman_salt/hostgroup_salt_module.rb

@@ -0,0 +1,6 @@
+module ForemanSalt
+  class HostgroupSaltModule < ActiveRecord::Base
+    belongs_to :hostgroup
+    belongs_to :salt_module
+  end
+end

data/app/models/foreman_salt/salt_environment.rb

@@ -5,19 +5,26 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
-    before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
-
     has_many :hosts, :class_name => '::Host::Managed'
     has_many :hostgroups, :class_name => '::Hostgroup'
 
-    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_('is alphanumeric and cannot contain spaces') }
+    has_many :salt_modules, :through => :salt_module_environments, :before_remove => :remove_from_hosts
+    has_many :salt_module_environments
 
-    default_scope lambda {
-      order('salt_environments.name')
-    }
+    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
     scoped_search :in => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
     scoped_search :in => :hosts, :on => :name, :complete_value => true, :rename => :host
+
+    def self.humanize_class_name(_name = nil)
+      _('Salt environment')
+    end
+
+    private
+
+    def remove_from_hosts(state)
+      HostSaltModule.joins(:host).where(:hosts => { :salt_environment_id => id }, :salt_module_id => state).destroy
+    end
   end
 end

data/app/models/foreman_salt/salt_module.rb

@@ -5,20 +5,42 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
-    before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
-    has_and_belongs_to_many :hosts, :class_name => '::Host::Managed', :join_table => 'hosts_salt_modules',
-                                    :association_foreign_key => 'host_id'
+    # before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
 
-    has_and_belongs_to_many :hostgroups, :class_name => '::Hostgroup', :join_table => 'hostgroups_salt_modules'
+    has_many :hosts, :through => :host_salt_modules, :class_name => '::Host::Managed'
+    has_many :host_salt_modules, :foreign_key => :salt_module_id
 
-    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d]+\.{0,1})+[^\.]\z/, :message => N_('must be alphanumeric, can contain dots and must not contain spaces') }
+    has_many :hostgroups, :through => :hostgroup_salt_modules
+    has_many :hostgroup_salt_modules, :foreign_key => :salt_module_id
+
+    has_many :salt_environments, :through => :salt_module_environments
+    has_many :salt_module_environments
+
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d\-]+\.{0,1})+[^\.]\z/, :message => N_('must be alphanumeric, can contain periods, dashes, underscores and must not contain spaces') }
 
     default_scope lambda {
       order('salt_modules.name')
     }
 
+    scope :in_environment, ->(environment) { joins(:salt_environments).where('salt_module_environments.salt_environment_id' => environment) }
+
     scoped_search :on => :name, :complete_value => true
+    scoped_search :in => :salt_environments, :on => :name, :complete_value => true, :rename => :environment
     scoped_search :in => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
     scoped_search :in => :hosts, :on => :name, :complete_value => true, :rename => :host
+
+    def self.to_hash
+      states = {}
+
+      SaltEnvironment.all.each do |environment|
+        states[environment.name] = environment.salt_modules.map(&:name)
+      end
+
+      states
+    end
+
+    def self.humanize_class_name(_name = nil)
+      _('Salt state')
+    end
   end
 end

data/app/models/foreman_salt/salt_module_environment.rb

@@ -0,0 +1,14 @@
+module ForemanSalt
+  class SaltModuleEnvironment < ActiveRecord::Base
+    belongs_to :salt_environment
+    belongs_to :salt_module
+
+    before_destroy :remove_from_hosts
+
+    private
+
+    def remove_from_hosts
+      HostSaltModule.joins(:host).where(:hosts => { :salt_environment_id => salt_environment_id }, :salt_module_id => salt_module_id).destroy
+    end
+  end
+end

data/app/overrides/salt_environment_host_selector.rb

@@ -0,0 +1,9 @@
+selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironment.all, :id, :name,
+                                 { :include_blank => blank_or_inherit_f(f, :salt_environment) },
+                                 { :label => _('Salt Environment'), :onchange => 'update_salt_states(this)', :'data-url' => salt_environment_selected_minions_path,
+                                   :'data-host-id' => (@host || @hostgroup).id, :help_inline => :indicator} %>"
+
+Deface::Override.new(:virtual_path  => 'hosts/_form',
+                     :name          => 'add_salt_environment_to_host',
+                     :insert_bottom => 'div#primary',
+                     :text          =>  selector_text)