foreman_salt 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fe9df5ebf245a2e3d62f66a9368a16a71ad78bbf07ff4ac5dc6dada03ad515
-  data.tar.gz: 48f709a541f72c61e6fa5133f5b10e8de76fefc72e3c143a50e9b6e4069f92f8
+  metadata.gz: dce5a18cef1f569ee315e5260928b43cc24a059b895f6cf2c4bbc6c98592cac8
+  data.tar.gz: 864b8551057471a940a44b5d0447502040558fc0b697339a7ca28a09f1256203
 SHA512:
-  metadata.gz: 8bb26eeb33777bb1c8a763d2238d2c47ad613efc90090f562821344126a1c0df24e4b50669131902632b1a19958f322b243870b6cd5b59b182a5c4166cab6640
-  data.tar.gz: 6b11de698ddfa5bc6da7a8e1ce2ab839e092018b158179b2e56cb70ede9fdbb53f667b63ab81a53c4ce26bc2887555b963b229a8ec6ad622bd26bcec03e1e98b
+  metadata.gz: d4ed7429fd288b8d07677e7bc28091262c5acc2f751fc511fa0a4b223bb8e9b257177a91098b94ef0e68dd660e704fbbe70ec37e0135d04a8e8a2ff6d9507445
+  data.tar.gz: 82aa1176e433e8223e8ceb8003bfc22eb2d207ada21cdfd0e98a106e78ec7338f484db96fa315a303757a910b91d65247f7edbb66719090570c69397b8a2d9b6

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module ForemanSalt
+  module Api
+    module V2
+      # API controller for Salt Variables
+      class SaltVariablesController < ::ForemanSalt::Api::V2::BaseController
+        include ::ForemanSalt::Concerns::SaltVariableParameters
+        include Foreman::Controller::Parameters::VariableLookupKey
+
+        wrap_parameters :salt_variable, :include => salt_variable_params_filter.accessible_attributes(parameter_filter_context) + ['salt_state_id']
+        before_action :find_resource, :only => [:show, :destroy, :update]
+
+        api :GET, '/salt_variables/:id', N_('Show variable')
+        param :id, :identifier, :required => true
+        def show; end
+
+        api :GET, '/salt_variables', N_('List Salt variables')
+        param_group :search_and_pagination, ::Api::V2::BaseController
+        def index
+          @salt_variables = resource_scope_for_index
+        end
+
+        api :DELETE, '/salt_variables/:id', N_('Deletes Salt variable')
+        param :id, :identifier, :required => true
+        def destroy
+          @salt_variable.destroy
+          render 'foreman_salt/api/v2/salt_variables/destroy'
+        end
+
+        def_param_group :salt_variable do
+          param :salt_variable, Hash, :required => true, :action_aware => true do
+            param :variable, String, :required => true, :desc => N_("Name of variable")
+            param :salt_state_id, :number, :required => true, :desc => N_("State ID")
+            param :default_value, :any_type, :of => LookupKey::KEY_TYPES, :desc => N_("Default value of variable")
+            param :hidden_value, :bool, :desc => N_("When enabled the parameter is hidden in the UI")
+            param :override_value_order, String, :desc => N_("The order in which values are resolved")
+            param :description, String, :desc => N_("Description of variable")
+            param :validator_type, LookupKey::VALIDATOR_TYPES, :desc => N_("Types of validation values")
+            param :validator_rule, String, :desc => N_("Used to enforce certain values for the parameter values")
+            param :variable_type, LookupKey::KEY_TYPES, :desc => N_("Types of variable values")
+            param :merge_overrides, :bool, :desc => N_("Merge all matching values (only array/hash type)")
+            param :merge_default, :bool, :desc => N_("Include default value when merging all matching values")
+            param :avoid_duplicates, :bool, :desc => N_("Remove duplicate values (only array type)")
+          end
+        end
+
+        api :POST, '/salt_variables', N_('Create Salt variable')
+        param_group :salt_variable, :as => :create
+        def create
+          params[:salt_variable][:salt_module_id] = params[:salt_variable].delete(:salt_state_id) if params[:salt_variable]
+          @salt_variable = SaltVariable.new(salt_variable_params)
+          process_response @salt_variable.save
+        end
+
+        api :PUT, '/salt_variables/:id', N_('Updates Salt variable')
+        param :id, :identifier, :required => true
+        param_group :salt_variable, :as => :update
+
+        def update
+          @salt_variable.update!(variable_lookup_key_params)
+          render 'foreman_salt/api/v2/salt_variables/show'
+        end
+
+        def controller_permission
+          'salt_variables'
+        end
+
+        def resource_class
+          ForemanSalt::SaltVariable
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ForemanSalt
+  module Concerns
+    # Keys to allow as parameters in the SaltVariable controller
+    module SaltOverrideValue
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def lookup_value_params_filter
+          Foreman::ParameterFilter.new(::LookupValue).tap do |filter|
+            filter.permit :salt_variable_id, :override_value => {}
+
+            filter.permit_by_context :hidden_value, :host_or_hostgroup, :lookup_key, :lookup_key_id,
+                                     :match, :omit, :value, :nested => true
+
+            filter.permit_by_context :id, :_destroy, :ui => false,
+                                     :api => false, :nested => true
+          end
+        end
+      end
+
+      def lookup_value_params
+        self.class.lookup_value_params_filter.filter_params(params, parameter_filter_context, 'foreman_salt_salt_variable')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ForemanSalt
+  module Concerns
+    # Keys to allow as parameters in the SaltVariable controller
+    module SaltVariableParameters
+      extend ActiveSupport::Concern
+      include Foreman::Controller::Parameters::LookupKey
+
+      class_methods do
+        def salt_variable_params_filter
+          Foreman::ParameterFilter.new(::ForemanSalt::SaltVariable).tap do |filter|
+            filter.permit :salt_module_id, :salt_modules => [], :salt_module_ids => [],
+                          :salt_module_names => [], :param_classes => [], :param_classes_ids => [],
+                          :param_classes_names => []
+            filter.permit_by_context :required, :nested => true
+            filter.permit_by_context :id, :ui => false, :api => false, :nested => true
+            add_lookup_key_params_filter(filter)
+          end
+        end
+      end
+
+      def salt_variable_params
+        param_name = parameter_filter_context.api? ? 'salt_variable' : 'foreman_salt_salt_variable'
+        self.class.salt_variable_params_filter.filter_params(params, parameter_filter_context, param_name)
+      end
+    end
+  end
+end

data/app/controllers/foreman_salt/minions_controller.rb

@@ -12,6 +12,8 @@ module ForemanSalt
       enc['classes'] = @minion.salt_modules_for_enc
 
       pillars = @minion.info['parameters']
+      pillars.merge!(@minion.salt_params)
+
       enc['parameters'] = Setting[:salt_namespace_pillars] ? { 'foreman' => pillars } : pillars
 
       enc['environment'] = env

data/app/controllers/foreman_salt/salt_variables_controller.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module ForemanSalt
+  # UI controller for salt variables
+  class SaltVariablesController < ::LookupKeysController
+    include Foreman::Controller::AutoCompleteSearch
+    include ::ForemanSalt::Concerns::SaltVariableParameters
+
+    before_action :find_resource, :only => [:edit, :update, :destroy], :if => proc { params[:id] }
+
+    def index
+      @salt_variables = resource_base.search_for(params[:search],
+                                                 :order => params[:order]).paginate(:page => params[:page],
+                                                 :per_page => params[:per_page])
+    end
+
+    def new
+      @salt_variable = SaltVariable.new
+    end
+
+    def create
+      @salt_variable = SaltVariable.new(salt_variable_params)
+      if @salt_variable.save
+        process_success
+      else
+        process_error
+      end
+    end
+
+    def resource_class
+      "ForemanSalt::#{controller_name.singularize.classify}".constantize
+    end
+
+    private
+
+    def default_order; end
+
+    def resource
+      @salt_variable
+    end
+
+    def resource_params
+      salt_variable_params
+    end
+  end
+end

data/app/helpers/foreman_salt/salt_modules_helper.rb

@@ -8,6 +8,20 @@ module ForemanSalt
       select_action_button(_('Import'), {}, links)
     end
 
+    def salt_module_select(form, persisted)
+      blank_opt = persisted ? {} : { :include_blank => true }
+      select_items = persisted ? [form.object.salt_module] : SaltModule.order(:name)
+      select_f form,
+               :salt_module_id,
+               select_items,
+               :id,
+               :to_label,
+               blank_opt,
+               :label => _('Salt State'),
+               :disabled => persisted,
+               :required => true
+    end
+
     def colorize(state)
       # Make the state easier to read
       combo = %w(2E9DB9 4D1D59 2C777E 1C4758 591D4B)

data/app/helpers/foreman_salt/salt_plugin_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{ForemanSalt::Engine.root}/lib/foreman_salt/version"
+
+module ForemanSalt
+  # General helper functions for foreman_salt
+  module SaltPluginHelper
+    def salt_doc_url
+      major_version = ::ForemanSalt::VERSION.split('.')[0]
+      "https://theforeman.org/plugins/foreman_salt/#{major_version}.x/index.html"
+    end
+  end
+end

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

@@ -47,11 +47,26 @@ module ForemanSalt
         before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
       end
 
+      def salt_params
+        variables = ForemanSalt::SaltVariable.where(:salt_module_id => all_salt_modules.pluck(:id), :override => true)
+        values = variables.values_hash(self)
+
+        variables.each_with_object({}) do |var, memo|
+          value = values[var]
+          memo[var.key] = value if value
+          memo
+        end
+      end
+
       def salt_modules_for_enc
+        all_salt_modules.collect(&:name).uniq
+      end
+
+      def all_salt_modules
         return [] unless salt_environment
 
         modules = salt_modules + (hostgroup ? hostgroup.all_salt_modules : [])
-        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules).pluck("salt_modules.name").uniq
+        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules)
       end
 
       def salt_master

data/app/models/foreman_salt/salt_module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanSalt
   class SaltModule < ApplicationRecord
     include Authorizable
@@ -11,6 +13,9 @@ module ForemanSalt
     has_many :hostgroup_salt_modules, :foreign_key => :salt_module_id
     has_many :hostgroups, :through => :hostgroup_salt_modules
 
+    has_many :salt_variables, :inverse_of => :salt_module,
+                              :dependent => :destroy
+
     has_many :salt_module_environments
     has_many :salt_environments, :through => :salt_module_environments
 

data/app/models/foreman_salt/salt_variable.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ForemanSalt
+  # Represents the variables used in Salt
+  class SaltVariable < LookupKey
+    belongs_to :salt_module, :inverse_of => :salt_variables
+    validates :salt_module_id, :presence => true
+    before_validation :cast_default_value, :if => :override?
+    scoped_search :on => :key, :aliases => [:name], :complete_value => true
+    scoped_search :relation => :salt_module, :on => :name,
+                  :complete_value => true, :rename => :salt_module
+
+    def salt?
+      true
+    end
+
+    def self.humanize_class_name(options = nil)
+      if options.present?
+        super
+      else
+        "Salt variable"
+      end
+    end
+
+    def editable_by_user?
+      SaltVariable.authorized(:edit_external_parameters).where(:id => id).exists?
+    end
+  end
+end

data/app/services/foreman_salt/report_importer.rb

@@ -79,7 +79,7 @@ module ForemanSalt
                     result['changes']['diff']
                   elsif !result['pchanges'].blank? && result['pchanges'].include?('diff')
                     result['pchanges']['diff']
-                  elsif !result['comment'].blank?
+                  elsif result['comment'].presence
                     result['comment']
                   else
                     'No message available'

data/app/views/foreman_salt/api/v2/salt_variables/create.json.rabl

@@ -0,0 +1,3 @@
+object @salt_variable
+
+extends "foreman_salt/api/v2/salt_variables/show"

data/app/views/foreman_salt/api/v2/salt_variables/destroy.json.rabl

@@ -0,0 +1,3 @@
+object @salt_variable
+
+extends "foreman_salt/api/v2/salt_variables/show"

data/app/views/foreman_salt/api/v2/salt_variables/index.json.rabl

@@ -0,0 +1,3 @@
+collection @salt_variables
+
+extends 'foreman_salt/api/v2/salt_variables/show'

data/app/views/foreman_salt/api/v2/salt_variables/show.json.rabl

@@ -0,0 +1,21 @@
+object @salt_variable
+
+attribute :parameter
+attributes :id, :variable, :salt_state, :salt_state_id, :description, :override,
+           :variable_type, :hidden_value?, :validator_type,
+           :validator_rule, :merge_overrides, :merge_default,
+           :avoid_duplicates, :override_value_order, :created_at, :updated_at,
+           :default_value
+
+node do |salt_variable|
+  {
+    :override_values => partial(
+      'api/v2/override_values/index',
+      :object => salt_variable.lookup_values
+    )
+  }
+end
+
+node :override_values_count do |lk|
+  lk.lookup_values.count
+end

data/app/views/foreman_salt/salt_modules/index.html.erb

@@ -23,9 +23,17 @@
       <td><%= link_to_if_authorized(salt_module.hosts.count, hash_for_hosts_path(:search => "salt_state = #{salt_module}")) %></td>
       <td><%= link_to_if_authorized(salt_module.hostgroups.count, hash_for_hostgroups_path(:search => "salt_state = #{salt_module}")) %></td>
       <td>
-          <%= action_buttons([display_link_if_authorized(_('Edit'), hash_for_edit_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer)),
-                             display_delete_if_authorized(hash_for_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer),
-                            :confirm => _('Delete %s?') % salt_module.name)]) %>
+          <%
+              links = [
+                  link_to(
+                  _('Variables'), salt_variables_path(:search => "salt_module = #{salt_module}")),
+                  display_link_if_authorized(_('Edit'), hash_for_edit_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer)),
+                  display_delete_if_authorized(hash_for_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer),
+                                               :confirm => _('Delete %s?') % salt_module.name)
+              ]
+          %>
+          <%= action_buttons(*links) %>
+      </td>
       </td>
     </tr>
   <% end %>

data/app/views/foreman_salt/salt_variables/_fields.erb

@@ -0,0 +1,73 @@
+<div id='<%= f.object.to_param %>' class='tab-pane fields'>
+  <fieldset>
+    <h2><%= _("Salt Variable Details")%></h2>
+    <%= text_f f, :key, :disabled => f.object.persisted?, :size => "col-md-8" %>
+    <%= textarea_f f, :description, :rows => :auto, :size => "col-md-8", :class => "no-stretch" %>
+    <%= salt_module_select f, f.object.persisted? %>
+
+  </fieldset>
+  <fieldset>
+    <h2><%= _("Default Behavior") %></h2>
+    <h6><%= _("Override the default value of the Salt variable.") %></h6>
+    <%= checkbox_f(f, :override, :onchange => 'toggleOverrideValue(this)', :size => "col-md-8",
+                   :label_help => _('Mark the variable to be managed by Foreman. When the Salt State of this variable is assigned to a host, the default value will be added as a Salt pillar for this host. Specify matchers to set a different value for such variable.')
+        ) %>
+
+    <% version = Foreman::Version.new %>
+    <% if version.major.to_i >= 1 && version.minor.to_i >= 22 %>
+      <%= param_type_selector(f, false, :onchange => 'keyTypeChange(this)', :disabled => !f.object.override) %>
+    <% else %>
+      <%= param_type_selector(f, :onchange => 'keyTypeChange(this)', :disabled => !f.object.override) %>
+    <% end %>
+    <%= textarea_f f, :default_value, :value => f.object.default_value_before_type_cast, :size => "col-md-8",
+                   :disabled => (!f.object.override || f.object.omit),
+                   :input_group_btn => fullscreen_input,
+                   :rows => 1,
+                   :label_help => _("Value to use when there is no match."),
+                   :class => "no-stretch #{'masked-input' if f.object.hidden_value?}" %>
+    <div class="form-group">
+      <%= checkbox_f(f, :hidden_value, :label => _('Hidden Value'),
+                     :class => 'hidden_value_textarea_switch', :onchange => 'toggle_lookupkey_hidden(this)',
+                     :checked => f.object.hidden_value?,
+                     :label_help => _("Hide all values for this parameter."),
+                     :size => "col-md-1", :label_size => "col-md-2", :table_field => true,
+                     :disabled => !f.object.override) %>
+    </div>
+  </fieldset>
+  <fieldset>
+    <%= collapsing_header _("Optional Input Validator"), "#optional_input_validators_#{f.object.id}", "collapsed" %>
+    <div id="optional_input_validators_<%= f.object.id %>" class="collapse out">
+      <h6><%= _('Before including these variables as Salt pillar, Foreman will validate that your variables comply with the validation.') %></h6>
+
+      <%= checkbox_f(f, :required, :size => "col-md-8", :disabled => !f.object.override,
+                     :label_help => _("If checked, will raise an error if there is no default value and no matcher provide a value.")
+          ) %>
+      <%= validator_type_selector f %>
+      <%= text_f f, :validator_rule, :size => "col-md-8", :disabled => f.object.validator_type.blank?, :class => "no-stretch" %>
+    </div>
+  </fieldset>
+  </br>
+  <div class="matcher-parent" <%= "id=#{f.object.key.to_s.gsub(' ', '_')}_lookup_key_override_value" %> style=<%= "display:none;" if !f.object.override %>>
+    <fieldset>
+      <h2><%= _("Prioritize Attribute Order") %></h2>
+      <h6><%= _("Set the order in which values are resolved.") %></h6>
+      <%= textarea_f f, :path, :rows => :auto, :label => _("Order"), :id => 'order', :size => "col-md-8", :onchange => 'fill_in_matchers()', :value => f.object.path, :class => "no-stretch",
+                        :label_help => _("The order in which matchers keys are processed, first match wins.<br> You may use multiple attributes as a matcher key, for example, an order of <code>host group, environment</code> would expect a matcher such as <code>hostgroup = \"web servers\", environment = production</code>").html_safe %>
+      <%= checkbox_f(f, :merge_overrides, :onchange => 'mergeOverridesChanged(this)', :table_field => true,
+                        :disabled => !f.object.supports_merge?, :size => "col-md-1", :label_size => "col-md-2",
+                        :label_help => _("Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted.")) %>
+      <%= checkbox_f(f, :merge_default, :disabled =>  !f.object.merge_overrides, :size => "col-md-1", :table_field => true,
+                        :label_size => "col-md-2", :label_help => _("Include default value when merging all matching values.")) %>
+      <%= checkbox_f(f, :avoid_duplicates, :disabled => (!f.object.supports_uniq? || !f.object.merge_overrides),
+                        :size => "col-md-1", :label_size => "col-md-2", :table_field => true,
+                        :label_help => _("Avoid duplicate values when merging them (only array type)?")) %>
+    </fieldset>
+    </br>
+    <fieldset>
+      <h2><%= _("Specify Matchers") %>  <%= documentation_button('4.2.6SmartMatchers') %></h2>
+      <div class="children_fields lookup_values">
+        <%= render 'lookup_keys/values', :f => f, :is_param => false %>
+      </div>
+    </fieldset>
+  </div>
+</div>

data/app/views/foreman_salt/salt_variables/edit.html.erb

@@ -0,0 +1,17 @@
+<%= breadcrumbs(
+  :items => [
+    {
+      :caption => _('Salt Variables'),
+      :url => url_for(salt_variables_path)
+    },
+    {
+      :caption => _('Edit %s' % @salt_variable.key)
+    }
+  ],
+  :switchable => false
+) %>
+<% title(_('Edit Salt Variable')) %>
+<%= form_for(@salt_variable, :url => salt_variable_path(:id => @salt_variable.id)) do |f| %>
+    <%= render 'fields', :f => f %>
+    <%= submit_or_cancel f %>
+<% end %>

data/app/views/foreman_salt/salt_variables/index.html.erb

@@ -0,0 +1,46 @@
+<% title _("Salt Variables") %>
+
+<%= title_actions display_link_if_authorized(_('New Salt Variable'), hash_for_new_salt_variable_path, :class => "btn btn-default no-float"),
+                  documentation_button('#4.3Variables', :root_url => salt_doc_url) %>
+
+<table class="<%= table_css_classes 'table-fixed' %>">
+  <thead>
+    <tr>
+      <th class='col-md-6'><%= sort :name, :as => s_('Variable|Name') %></th>
+      <th class='col-md-2'><%= sort :salt_module, :as => s_('Variable|State') %></th>
+      <th class='col-md-1'><%= _('Type') %></th>
+      <th class='col-md-2'><%= _('Actions') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @salt_variables.each do |variable| %>
+      <tr>
+        <td class="ellipsis"><%= link_to_if_authorized(
+            icon_text((variable.override ? "flag": ""), variable.key.to_s, :kind => 'fa', :title => _('Overriden')),
+            hash_for_edit_salt_variable_path(:id => variable).
+            merge(:auth_object => variable,
+                  :permission => 'edit_external_parameters',
+                  :authorizer => authorizer)
+        ) %></td>
+        <td class="ellipsis"><%= link_to_if_authorized(
+          variable.salt_module.name,
+          hash_for_salt_variables_path(:search => "salt_module = #{variable.salt_module}")
+        ) %></td>
+        <td class="ellipsis"><%= variable.key_type || 'string' %></td>
+        <td class="ellipsis">
+          <% links = [
+            display_delete_if_authorized(
+              hash_for_salt_variable_path(:id => variable.id).merge(
+                :auth_object => variable,
+                :authorizer => authorizer),
+                :data => { :confirm => _("Delete %s?") % variable.key },
+                :action => :delete)
+          ] %>
+          <%= action_buttons(*links) %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate_with_info @salt_variables %>

data/app/views/foreman_salt/salt_variables/new.html.erb

@@ -0,0 +1,17 @@
+<%= breadcrumbs(
+  :items => [
+    {
+      :caption => _('Salt Variables'),
+      :url => url_for(salt_variables_path)
+    },
+    {
+      :caption => _('Create Salt Variable')
+    }
+  ],
+  :switchable => false
+) %>
+<% title(_('Create Salt Variable')) %>
+<%= form_for(@salt_variable, :url => salt_variables_path) do |f| %>
+    <%= render 'fields', :f => f %>
+    <%= submit_or_cancel f %>
+<% end %>

data/config/routes.rb

@@ -27,6 +27,13 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :salt_variables, :controller => 'foreman_salt/salt_variables', :except => [:show] do
+      resources :lookup_values, :only => [:index, :create, :update, :destroy]
+      collection do
+        get 'auto_complete_search'
+      end
+    end
+
     scope :api, :path => '/api', :defaults => { :format => 'json' } do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },
                        :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
@@ -49,6 +56,8 @@ Rails.application.routes.draw do
           resources :salt_minions, :only => [:show, :index, :update], :controller => 'foreman_salt/api/v2/salt_minions'
           resources :salt_states, :only => [:show, :index, :create, :destroy], :controller => 'foreman_salt/api/v2/salt_states'
         end
+
+        resources :salt_variables, :only => [:show, :index, :destroy, :update, :create], :controller => 'foreman_salt/api/v2/salt_variables'
       end
     end
   end

data/db/migrate/20190515112233_add_salt_module_id_to_lookup_keys.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# to keep track of when the modules were imported
+class AddSaltModuleIdToLookupKeys < ActiveRecord::Migration[4.2]
+  def up
+    add_column :lookup_keys, :salt_module_id, :integer
+    add_index :lookup_keys, :salt_module_id
+  end
+
+  def down
+    remove_index :lookup_keys, :salt_module_id
+    remove_column :lookup_keys, :salt_module_id
+  end
+end