foreman_salt 13.1.0 → 13.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce5a18cef1f569ee315e5260928b43cc24a059b895f6cf2c4bbc6c98592cac8
-  data.tar.gz: 864b8551057471a940a44b5d0447502040558fc0b697339a7ca28a09f1256203
+  metadata.gz: fddee03aa8a25bb479f486dff933348cd4d2ecd5f58acfd3a24b0f41e42add81
+  data.tar.gz: fd3936b47b815c6dde269e4b1a31c31688f32654d77b134d64fec3f9a001c279
 SHA512:
-  metadata.gz: d4ed7429fd288b8d07677e7bc28091262c5acc2f751fc511fa0a4b223bb8e9b257177a91098b94ef0e68dd660e704fbbe70ec37e0135d04a8e8a2ff6d9507445
-  data.tar.gz: 82aa1176e433e8223e8ceb8003bfc22eb2d207ada21cdfd0e98a106e78ec7338f484db96fa315a303757a910b91d65247f7edbb66719090570c69397b8a2d9b6
+  metadata.gz: 0cc753435d43457397cab17d476c9bd35a411ce11835f33e664b3032efe847332762e8b1b28efc3f97051cd7015bb0b99662aae6502ad52c3c8f232f62d6029c
+  data.tar.gz: 9840624a4241c66a91314f1a5a4eff96dada377aa0bf7b33bcb9d928143ed795978b6f874d6e444f4678c1d623e13e5b53601734ad08180fcbc320c3eb9d8780

data/README.md

@@ -14,6 +14,9 @@ This plug-in adds support for Salt to Foreman.
 | <= 1.16         | 10.0.0         |
 | >= 1.17         | 10.1.0         |
 | >= 1.21         | 10.2.0         |
+| >= 1.22         | 10.3.1         |
+| >= 1.23         | 11.0.1         |
+| >= 1.24         | 13.2.0         |
 
 ## Documentation
 

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

@@ -7,6 +7,9 @@ module ForemanSalt
         include ::Foreman::Controller::SmartProxyAuth
         add_smart_proxy_filters :upload, :features => 'Salt'
 
+        include ::Foreman::Controller::FilterParameters
+        filter_parameters :job
+
         def_param_group :job do
           param :job, Hash, :required => true, :action_aware => true do
             param :job_id, Integer, :required => true, :desc => N_('JID')

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

@@ -6,7 +6,6 @@ module ForemanSalt
       # 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]
@@ -58,7 +57,7 @@ module ForemanSalt
         param_group :salt_variable, :as => :update
 
         def update
-          @salt_variable.update!(variable_lookup_key_params)
+          @salt_variable.update!(salt_variable_params)
           render 'foreman_salt/api/v2/salt_variables/show'
         end
 

data/app/controllers/foreman_salt/minions_controller.rb

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

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

@@ -1,13 +1,2 @@
 # Create feature for Smart Proxy
 Feature.where(:name => 'Salt').first_or_create
-
-# Add new viewing permissions to Viewer role
-viewer = Role.find_by_name('Viewer')
-
-if viewer
-  Permission.where(:name => [:view_smart_proxies_salt_keys, :view_smart_proxies_salt_autosign, :view_salt_modules]).each do |permission|
-    viewer.ignore_locking do
-      viewer.add_permissions!([permission.name]) unless viewer.permissions.include? permission
-    end
-  end
-end

data/db/seeds.d/76-job_templates.rb

@@ -22,8 +22,8 @@ if ForemanSalt.with_remote_execution?
                                              :default => true,
                                              :locked => true,
                                              :update => sync)
-          template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
-          template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+          template.organizations = organizations if template.present?
+          template.locations = locations if template.present?
         end
       end
     end

data/lib/foreman_salt/extensions.rb

@@ -1,5 +1,5 @@
 begin
-  ::FactImporter.register_fact_importer(:foreman_salt, ForemanSalt::FactImporter)
+  ::Foreman::Plugin.fact_importer_registry.register(:foreman_salt, ForemanSalt::FactImporter)
   ::FactParser.register_fact_parser(:foreman_salt, ForemanSalt::FactParser)
 
   # Helper Extensions

data/lib/foreman_salt/plugin.rb

@@ -165,6 +165,11 @@ Foreman::Plugin.register :foreman_salt do
                       :create_salt_variables, :view_salt_variables,
                       :edit_salt_variables, :destroy_salt_variables]
 
+  role 'Salt viewer', [:view_smart_proxies_salt_keys,
+                       :view_smart_proxies_salt_autosign,
+                       :view_salt_variables,
+                       :view_salt_environments,
+                       :view_salt_modules]
 
   # Parameter filters
   parameter_filter Hostgroup,

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '13.1.0'
+  VERSION = '13.2.4'
 end

data/locale/action_names.rb

@@ -1,4 +1,5 @@
 # Autogenerated!
 _("Action with sub plans")
 _("Import facts")
-_("Import Puppet classes")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/ca/foreman_salt.po

@@ -0,0 +1,541 @@
+# Catalan translations for foreman_salt package.
+# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_salt package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_salt 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-05-11 18:53+0530\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+
+msgid "*Clear environment*"
+msgstr ""
+
+msgid "Accept"
+msgstr ""
+
+msgid "Accepted"
+msgstr ""
+
+msgid "Action with sub plans"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Added"
+msgstr ""
+
+msgid "Array of State ids"
+msgstr ""
+
+msgid "Autosign"
+msgstr ""
+
+msgid "Autosign entries for %s"
+msgstr ""
+
+msgid "Autosign record"
+msgstr ""
+
+msgid "Avoid duplicate values when merging them (only array type)?"
+msgstr ""
+
+msgid "Before including these variables as Salt pillar, Foreman will validate that your variables comply with the validation."
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Change Salt Environment"
+msgstr ""
+
+msgid "Change Salt Master"
+msgstr ""
+
+msgid "Check/Uncheck Added"
+msgstr ""
+
+msgid "Check/Uncheck All"
+msgstr ""
+
+msgid "Check/Uncheck Removed"
+msgstr ""
+
+msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
+msgstr ""
+
+msgid "Could not find salt environment with id %s"
+msgstr ""
+
+msgid "Create Salt Variable"
+msgstr ""
+
+msgid "Create Salt variable"
+msgstr ""
+
+msgid "Create a Salt environment"
+msgstr ""
+
+msgid "Create a state"
+msgstr ""
+
+msgid "Create an autosign record"
+msgstr ""
+
+msgid "Default Behavior"
+msgstr ""
+
+msgid "Default value of variable"
+msgstr ""
+
+msgid "Delete %s?"
+msgstr ""
+
+msgid "Delete a Salt Key"
+msgstr ""
+
+msgid "Delete an autosign record"
+msgstr ""
+
+msgid "Deletes Salt variable"
+msgstr ""
+
+msgid "Description of variable"
+msgstr ""
+
+msgid "Destroy a Salt environment"
+msgstr ""
+
+msgid "Destroy a state"
+msgstr ""
+
+msgid "Dryrun only"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit %s"
+msgstr ""
+
+msgid "Edit Salt Environment %s"
+msgstr ""
+
+msgid "Edit Salt State %s"
+msgstr ""
+
+msgid "Edit Salt Variable"
+msgstr ""
+
+msgid "Environment"
+msgstr ""
+
+msgid "Environments"
+msgstr ""
+
+msgid "FQDN of host that key belongs to"
+msgstr ""
+
+msgid "Failed to execute state.highstate: %s"
+msgstr ""
+
+msgid "Filter %s"
+msgstr ""
+
+msgid "Fingerprint"
+msgstr ""
+
+msgid "Function"
+msgstr ""
+
+msgid "Hidden Value"
+msgstr ""
+
+msgid "Hide all values for this parameter."
+msgstr ""
+
+msgid "Hide the Run Salt state.highstate button on the host details page"
+msgstr ""
+
+msgid "Host groups"
+msgstr ""
+
+msgid "Host must have an environment in order to set salt states"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "ID of Salt Proxy"
+msgstr ""
+
+msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
+msgid "Import from %s"
+msgstr ""
+
+msgid "Import states from a salt master"
+msgstr ""
+
+msgid "Include default value when merging all matching values"
+msgstr ""
+
+msgid "Include default value when merging all matching values."
+msgstr ""
+
+msgid "Invalid report"
+msgstr ""
+
+msgid "JID"
+msgstr ""
+
+msgid "Key Name"
+msgstr ""
+
+msgid "Keys"
+msgstr ""
+
+msgid "Limit to a specific environment"
+msgstr ""
+
+msgid "Limit to a specific environments"
+msgstr ""
+
+msgid "Limit to specific actions: i.e. add, remove"
+msgstr ""
+
+msgid "List Salt variables"
+msgstr ""
+
+msgid "List all Salt Minions"
+msgstr ""
+
+msgid "List all Salt environments"
+msgstr ""
+
+msgid "List all Salt keys"
+msgstr ""
+
+msgid "List all Salt states"
+msgstr ""
+
+msgid "List all autosign records"
+msgstr ""
+
+msgid "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."
+msgstr ""
+
+msgid "Merge all matching values (only array/hash type)"
+msgstr ""
+
+msgid "Must specify a Smart Proxy to use"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the Salt state"
+msgstr ""
+
+msgid "Name of variable"
+msgstr ""
+
+msgid "Namespace Foreman pillars under 'foreman' key"
+msgstr ""
+
+msgid "New"
+msgstr ""
+
+msgid "New Autosign Entry"
+msgstr ""
+
+msgid "New Salt Environment"
+msgstr ""
+
+msgid "New Salt State"
+msgstr ""
+
+msgid "New Salt Variable"
+msgstr ""
+
+msgid "No Salt master defined - can't continue"
+msgstr ""
+
+msgid "No changes found"
+msgstr ""
+
+msgid "No salt environment selected!"
+msgstr ""
+
+msgid "Operation"
+msgstr ""
+
+msgid "Optional Input Validator"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Override the default value of the Salt variable."
+msgstr ""
+
+msgid "Overriden"
+msgstr ""
+
+msgid "Please select a Salt environment first"
+msgstr ""
+
+msgid "Prioritize Attribute Order"
+msgstr ""
+
+msgid "Record deleted."
+msgstr ""
+
+msgid "Reject"
+msgstr ""
+
+msgid "Rejected"
+msgstr ""
+
+msgid "Remote action:"
+msgstr ""
+
+msgid "Remove duplicate values (only array type)"
+msgstr ""
+
+msgid "Removed"
+msgstr ""
+
+msgid "Result"
+msgstr ""
+
+msgid "Run Salt"
+msgstr ""
+
+msgid "Run Salt state.highstate"
+msgstr ""
+
+msgid "Salt Autosign"
+msgstr ""
+
+msgid "Salt ENC"
+msgstr ""
+
+msgid "Salt Environment"
+msgstr ""
+
+msgid "Salt Environments"
+msgstr ""
+
+msgid "Salt Keys"
+msgstr ""
+
+msgid "Salt Keys on %s"
+msgstr ""
+
+msgid "Salt Master"
+msgstr ""
+
+msgid "Salt Smart Proxy ID"
+msgstr ""
+
+msgid "Salt State"
+msgstr ""
+
+msgid "Salt States"
+msgstr ""
+
+msgid "Salt Variable Details"
+msgstr ""
+
+msgid "Salt Variables"
+msgstr ""
+
+msgid "Salt environment"
+msgstr ""
+
+msgid "Salt environment ID"
+msgstr ""
+
+msgid "Salt external nodes YAML dump"
+msgstr ""
+
+msgid "Salt state"
+msgstr ""
+
+msgid "Salt states must be in the environment of the host"
+msgstr ""
+
+msgid "SaltEnvironment|Name"
+msgstr ""
+
+msgid "SaltModule|Name"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Select salt environment"
+msgstr ""
+
+msgid "Select the changes you want to realize in Foreman"
+msgstr ""
+
+msgid "Set the order in which values are resolved."
+msgstr ""
+
+msgid "Show a Salt environment"
+msgstr ""
+
+msgid "Show a minion"
+msgstr ""
+
+msgid "Show a state"
+msgstr ""
+
+msgid "Show variable"
+msgstr ""
+
+msgid "Specify Matchers"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "State ID"
+msgstr ""
+
+msgid "State can be \"accepted\" or \"rejected\""
+msgstr ""
+
+msgid "States"
+msgstr ""
+
+msgid "Successfully executed, check log files for more details"
+msgstr ""
+
+msgid "Successfully imported"
+msgstr ""
+
+msgid "Successfully updated %s."
+msgstr ""
+
+msgid "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>"
+msgstr ""
+
+msgid "The order in which values are resolved"
+msgstr ""
+
+msgid "Toggle"
+msgstr ""
+
+msgid "Trigger a state.highstate run on a node"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Types of validation values"
+msgstr ""
+
+msgid "Types of variable values"
+msgstr ""
+
+msgid "Unable to accept Salt key for %s"
+msgstr ""
+
+msgid "Unable to delete Salt autosign for %s"
+msgstr ""
+
+msgid "Unable to delete Salt key for %s"
+msgstr ""
+
+msgid "Unable to fetch Salt environments list"
+msgstr ""
+
+msgid "Unable to fetch Salt key list"
+msgstr ""
+
+msgid "Unable to fetch Salt states list"
+msgstr ""
+
+msgid "Unable to fetch autosign list"
+msgstr ""
+
+msgid ""
+"Unable to generate output, Check log files\n"
+msgstr ""
+
+msgid "Unable to reject Salt key for %s"
+msgstr ""
+
+msgid "Unable to run Salt state.highstate for %s"
+msgstr ""
+
+msgid "Unable to set Salt autosign for %s"
+msgstr ""
+
+msgid "Unaccepted"
+msgstr ""
+
+msgid "Update"
+msgstr ""
+
+msgid "Update a Salt Key"
+msgstr ""
+
+msgid "Update a minion"
+msgstr ""
+
+msgid "Updated hosts: changed salt environment"
+msgstr ""
+
+msgid "Updates Salt variable"
+msgstr ""
+
+msgid "Upload a Job"
+msgstr ""
+
+msgid "Used to enforce certain values for the parameter values"
+msgstr ""
+
+msgid "Value to use when there is no match."
+msgstr ""
+
+msgid "Variables"
+msgstr ""
+
+msgid "Variable|Name"
+msgstr ""
+
+msgid "Variable|State"
+msgstr ""
+
+msgid "When enabled the parameter is hidden in the UI"
+msgstr ""
+
+msgid "is alphanumeric and cannot contain spaces"
+msgstr ""
+
+msgid "must be alphanumeric, can contain periods, dashes, underscores and must not contain spaces"
+msgstr ""