foreman_salt 11.0.1 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75a6fd9ee16ef59ad978d457723b302e25ea5c1f7eb51539da5f09cce7cd5e1
-  data.tar.gz: 4142957af5c780555bed824e08f515cb4995fba63aec776597765a0351cd58ec
+  metadata.gz: 7b93dcc3ed4cb4806ab2b58c7843ce90375ecaf98ad307f978d3f4c151be7854
+  data.tar.gz: 3e8a71fd43af8e1b16dfb64a2c0450b5a0859a20f1642b639c326b4543ed4d66
 SHA512:
-  metadata.gz: 0b259ef476bce1cdeba1d091f47b0845abac31d138d613cc91d50dc56baadd0234fd2031acac88807f5d57978bb055c27bfb3883e34ecf94e47d67dbd31dc178
-  data.tar.gz: 7c331b327215edfac48e394318a5290a97121d024572e409f3ae608558d2a7a769c78fc9797fe93805daaefe176579a3422cdce32b400c8ef0abbb65a9a4ed7e
+  metadata.gz: 02a60d1d5fcd0f83d345f41e69843312ed355f3afeefc1fba9d715335289774b36fc48a462816b3b7698df79ba3c090430f7f69b4aa0457300e07b0842bed468
+  data.tar.gz: 348414476a5cb42f0b8d7999b49003775eaee02720f1a1488f9b8c84cb846d3bd7e50113768f75a3ff8545df8c5b17b9a5fdd13c262e2fd7240462425644f6ba

data/app/models/foreman_salt/salt_provider.rb

@@ -0,0 +1,27 @@
+module ForemanSalt
+  class SaltProvider < RemoteExecutionProvider
+    class << self
+      def supports_effective_user?
+        true
+      end
+
+      def proxy_operation_name
+        'salt'
+      end
+
+      def humanized_name
+        'Salt'
+      end
+
+      def proxy_command_options(template_invocation, host)
+        super(template_invocation, host).merge(:name => host.name)
+      end
+
+      def ssh_password(_host); end
+
+      def ssh_key_passphrase(_host); end
+
+      def sudo_password(_host); end
+    end
+  end
+end

data/app/views/foreman_salt/job_templates/salt_run_command_-_salt_default.erb

@@ -0,0 +1,19 @@
+<%#
+name: Salt Script Command - Salt default
+job_category: Salt
+description_format: Run script on a host
+provider_type: Salt
+snippet: false
+template_inputs:
+- name: script
+  required: true
+  input_type: user
+  description: "Run script on a host"
+  advanced: false
+kind: job_template
+%>
+
+"execute script":
+  cmd.run:
+    - name: |
+<%=     indent(8) { input('script') } %>

data/app/views/foreman_salt/job_templates/salt_run_function_-_ssh_default.erb

@@ -1,6 +1,6 @@
 <%#
 name: Salt Run function - SSH default
-job_category: Salt
+job_category: Salt-Call
 description_format: Run Salt function on host
 provider_type: SSH
 snippet: false

data/app/views/foreman_salt/job_templates/salt_run_state_highstate_-_salt_default.erb

@@ -0,0 +1,13 @@
+<%#
+name: Salt Run state.highstate - Salt default
+job_category: Salt
+description_format: Run Salt state.highstate on host
+feature: foreman_salt_run_state_highstate
+provider_type: Salt
+snippet: false
+kind: job_template
+%>
+
+state.highstate:
+  module.run:
+    - state.highstate:

data/app/views/foreman_salt/job_templates/salt_run_state_highstate_-_ssh_default.erb

@@ -1,6 +1,6 @@
 <%#
 name: Salt Run state.highstate - SSH default
-job_category: Salt
+job_category: Salt-Call
 description_format: Run Salt state.highstate on host
 feature: foreman_salt_run_state_highstate
 provider_type: SSH

data/app/views/foreman_salt/job_templates/salt_state_-_salt_default.erb

@@ -0,0 +1,26 @@
+<%#
+name: Salt State - Salt default
+job_category: Salt
+description_format: Apply Salt state on a host
+provider_type: Salt
+snippet: false
+template_inputs:
+- name: state
+  required: true
+  input_type: user
+  advanced: false
+  description: |
+    Salt state to apply on a host. For example to install and enable redis one would do
+
+    redis:
+      pkg.installed: []
+      service.running:
+        - enable: True
+        - reload: True
+        - watch:
+          - pkg: redis
+
+kind: job_template
+%>
+
+<%= input('state') %>

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

@@ -4,16 +4,27 @@ organizations = Organization.unscoped.all
 locations = Location.unscoped.all
 if ForemanSalt.with_remote_execution?
   User.as_anonymous_admin do
-    JobTemplate.without_auditing do
-      Dir[File.join("#{ForemanSalt::Engine.root}/app/views/foreman_salt/"\
+    RemoteExecutionFeature.without_auditing do
+      if Rails.env.test? || Foreman.in_rake?
+        # If this file tries to import a template with a REX feature in a SeedsTest,
+        # it will fail - the REX feature isn't registered on SeedsTest because
+        # DatabaseCleaner truncates the db before every test.
+        # During db:seed, we also want to know the feature is registered before
+        # seeding the template
+        # kudos to dLobatog
+        ForemanSalt.register_rex_feature
+      end
+      JobTemplate.without_auditing do
+        Dir[File.join("#{ForemanSalt::Engine.root}/app/views/foreman_salt/"\
                     'job_templates/**/*.erb')].each do |template|
-        sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-        template = JobTemplate.import_raw!(File.read(template),
-                                           :default => true,
-                                           :locked => true,
-                                           :update => sync)
-        template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
-        template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+          sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
+          template = JobTemplate.import_raw!(File.read(template),
+                                             :default => true,
+                                             :locked => true,
+                                             :update => sync)
+          template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
+          template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+        end
       end
     end
   end

data/lib/foreman_salt/engine.rb

@@ -1,4 +1,5 @@
 require 'deface'
+require 'foreman_remote_execution'
 
 module ForemanSalt
   class Engine < ::Rails::Engine
@@ -61,6 +62,9 @@ module ForemanSalt
 
     config.to_prepare do
       require 'foreman_salt/extensions'
+
+      RemoteExecutionProvider.register(:Salt, SaltProvider)
+      ForemanSalt.register_rex_feature
     end
   end
 
@@ -68,4 +72,13 @@ module ForemanSalt
   def self.with_remote_execution?
     RemoteExecutionFeature rescue false
   end
+
+  def self.register_rex_feature
+    options = {
+      :description => N_("Run Salt state.highstate"),
+      :host_action_button => true
+    }
+
+    RemoteExecutionFeature.register(:foreman_salt_run_state_highstate, N_("Run Salt"), options)
+  end
 end

data/lib/foreman_salt/plugin.rb

@@ -146,14 +146,5 @@ Foreman::Plugin.register :foreman_salt do
                    :salt_proxy_id, :salt_proxy_name,
                    :salt_environment_id, :salt_environment_name, :salt_modules => [],
                    :salt_module_ids => []
-
-  if ForemanSalt.with_remote_execution? && Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
-    options = {
-      :description => N_("Run Salt state.highstate"),
-      :host_action_button => true
-    }
-
-    RemoteExecutionFeature.register(:foreman_salt_run_state_highstate, N_("Run Salt"), options)
-  end
 end
 # rubocop:enable BlockLength

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '11.0.1'
+  VERSION = '12.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 12.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: foreman_remote_execution
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/salt_module.rb
 - app/models/foreman_salt/salt_module_environment.rb
+- app/models/foreman_salt/salt_provider.rb
 - app/models/setting/salt.rb
 - app/overrides/salt_environment_host_selector.rb
 - app/overrides/salt_environment_hostgroup_selector.rb
@@ -128,8 +143,11 @@ files:
 - app/views/foreman_salt/api/v2/salt_states/index.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/main.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/show.json.rabl
+- app/views/foreman_salt/job_templates/salt_run_command_-_salt_default.erb
 - app/views/foreman_salt/job_templates/salt_run_function_-_ssh_default.erb
+- app/views/foreman_salt/job_templates/salt_run_state_highstate_-_salt_default.erb
 - app/views/foreman_salt/job_templates/salt_run_state_highstate_-_ssh_default.erb
+- app/views/foreman_salt/job_templates/salt_state_-_salt_default.erb
 - app/views/foreman_salt/salt_autosign/_form.html.erb
 - app/views/foreman_salt/salt_autosign/index.html.erb
 - app/views/foreman_salt/salt_autosign/new.html.erb