foreman_remote_execution 1.2.2 → 1.3.0

data/app/models/remote_execution_feature.rb

@@ -1,4 +1,5 @@
 class RemoteExecutionFeature < ActiveRecord::Base
+  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button]
   validates :label, :name, :presence => true, :uniqueness => true
 
   belongs_to :job_template
@@ -6,6 +7,8 @@ class RemoteExecutionFeature < ActiveRecord::Base
   extend FriendlyId
   friendly_id :label
 
+  scope :with_host_action_button, lambda { where(:host_action_button => true) }
+
   def provided_input_names
     self.provided_inputs.to_s.split(',').map(&:strip)
   end
@@ -20,12 +23,22 @@ class RemoteExecutionFeature < ActiveRecord::Base
 
   def self.register(label, name, options = {})
     return false unless RemoteExecutionFeature.table_exists?
-    options.assert_valid_keys(:provided_inputs, :description)
+    options.assert_valid_keys(*VALID_OPTIONS)
+    options[:host_action_button] = false unless options.key?(:host_action_button)
+
     feature = self.find_by_label(label)
+
+    attributes = { :name => name, :provided_input_names => options[:provided_inputs], :description => options[:description], :host_action_button => options[:host_action_button] }
+    # in case DB does not have the attribute created yet but plugin initializer registers the feature, we need to skip this attribute
+    unless self.attribute_names.include?('host_action_button')
+      attributes.delete(:host_action_button)
+    end
+
     if feature.nil?
-      feature = self.create!(:label => label, :name => name, :provided_input_names => options[:provided_inputs], :description => options[:description])
+      feature = self.create!({ :label => label }.merge(attributes))
     else
-      feature.update_attributes!(:name => name, :provided_input_names => options[:provided_inputs], :description => options[:description])
+      feature.attributes = attributes
+      feature.save if feature.changed?
     end
     return feature
   end

data/app/models/setting/remote_execution.rb

@@ -35,7 +35,10 @@ class Setting::RemoteExecution < Setting
                  true),
         self.set('remote_execution_ssh_port',
                 N_('Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port.'),
-                '22')
+                '22'),
+        self.set('remote_execution_connect_by_ip',
+                 N_('Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip.'),
+                false),
       ].each { |s| self.create! s.update(:category => 'Setting::RemoteExecution') }
     end
 

data/app/models/ssh_execution_provider.rb

@@ -18,6 +18,23 @@ class SSHExecutionProvider < RemoteExecutionProvider
       true
     end
 
+    def find_ip_or_hostname(host)
+      interfaces = effective_interfaces(host)
+      if host_setting(host, :remote_execution_connect_by_ip)
+        ip_interface = interfaces.find { |i| i.ip.present? }
+      end
+      if ip_interface
+        ip_interface.ip
+      else
+        fqdn_interface = interfaces.find { |i| i.fqdn.present? }
+        if fqdn_interface
+          fqdn_interface.fqdn
+        else
+          raise _('Could not find any suitable interface for execution')
+        end
+      end
+    end
+
     private
 
     def ssh_user(host)
@@ -25,7 +42,7 @@ class SSHExecutionProvider < RemoteExecutionProvider
     end
 
     def ssh_port(host)
-      Integer(host.params['remote_execution_ssh_port'] || Setting[:remote_execution_ssh_port])
+      Integer(host_setting(host, :remote_execution_ssh_port))
     end
 
     def effective_user(template_invocation)
@@ -33,12 +50,26 @@ class SSHExecutionProvider < RemoteExecutionProvider
     end
 
     def effective_user_method(host)
-      method = host.params['remote_execution_effective_user_method'] || Setting[:remote_execution_effective_user_method]
+      method = host_setting(host, :remote_execution_effective_user_method)
       unless EFFECTIVE_USER_METHODS.include?(method)
         raise _('Effective user method "%{current_value}" is not one of %{valid_methods}') %
                   { :current_value => method, :valid_methods => EFFECTIVE_USER_METHODS}
       end
       method
     end
+
+    private
+
+    def effective_interfaces(host)
+      interfaces = []
+      %w(execution primary provision).map do |flag|
+        interfaces << host.send(flag + '_interface')
+      end
+      interfaces.compact.uniq
+    end
+
+    def host_setting(host, setting)
+      host.params[setting.to_s] || Setting[setting]
+    end
   end
 end

data/app/models/targeting.rb

@@ -36,9 +36,13 @@ class Targeting < ActiveRecord::Base
     raise ::Foreman::Exception, _('Cannot resolve hosts without a bookmark or search query') if bookmark.nil? && search_query.blank?
 
     self.search_query = bookmark.query if dynamic? && bookmark.present?
-    self.save!
-    self.touch(:resolved_at)
-    self.hosts = User.as(user.login) { Host.authorized(RESOLVE_PERMISSION, Host).search_for(search_query) }
+    self.resolved_at = Time.zone.now
+    self.validate!
+    # avoid validation of hosts objects - tey will be loaded for no reason.
+    host_ids = User.as(user.login) { Host.authorized(RESOLVE_PERMISSION, Host).search_for(search_query).pluck(:id) }
+    # this can be optimized even more, by introducing bulk insert
+    self.targeting_hosts.build(host_ids.map { |id| { :host_id => id } })
+    self.save(:validate => false)
   end
 
   def dynamic?

data/app/views/api/v2/remote_execution_features/base.json.rabl

@@ -1,3 +1,3 @@
 object @remote_execution_feature
 
-attributes :id, :label, :name, :description, :job_template_id, :job_template_name
+attributes :id, :label, :name, :description, :job_template_id, :job_template_name, :host_action_button

data/app/views/job_invocations/_form.html.erb

@@ -91,16 +91,13 @@
     </div>
 
     <div class="form-group advanced hidden">
-      <label class="col-md-2 control-label"><%= _('Type of query') %></label>
+      <%= add_label({ :label => _('Type of query'), :label_help => _("Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>") }, f, :targetting_type) %>
 
       <div class="col-md-4">
         <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::STATIC_TYPE, :text => _(Targeting::TYPES[Targeting::STATIC_TYPE]) %>
         <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::DYNAMIC_TYPE, :text => _(Targeting::TYPES[Targeting::DYNAMIC_TYPE]) %>
       </div>
 
-      <span class="help-inline"><%= popover(_('Explanation'),
-                                            _("Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>")) %>
-      </span>
     </div>
   <% end %>
 

data/app/views/job_invocations/_host_name_td.html.erb

@@ -1,6 +1,7 @@
 <td class="host_name" id="<%= dom_id(host) %>-name" data-refresh_required="<%= task.nil? ? 'true' : '' %>" data-id="<%= host.id %>">
   <% if task %>
-    <%= link_to_if_authorized host.name, hash_for_template_invocation_path(:id => template_invocation).merge(:auth_object => host, :permission => :view_hosts) %>
+    <%= link_to_if_authorized host.name, hash_for_template_invocation_path(:id => template_invocation).merge(:auth_object => host, :permission => :view_hosts, :authorizer => job_hosts_authorizer) %>
+
   <% else %>
     <%= host.name %>
   <% end %>

data/app/views/job_invocations/index.html.erb

@@ -18,7 +18,7 @@
   <tbody>
     <% @job_invocations.each do |invocation| %>
       <tr>
-        <td><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations) %></td>
+        <td><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
         <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
         <td><%= invocation_result(invocation, :success_count) %></td>
         <td><%= invocation_result(invocation, :failed_count) %></td>

data/app/views/job_invocations/show.html.erb

@@ -1,6 +1,6 @@
 <% title @job_invocation.description, trunc_with_tooltip(@job_invocation.description, 120) %>
 <% stylesheet 'job_invocations' %>
-<% javascript 'template_invocation' %>
+<% javascript 'charts', 'template_invocation' %>
 
 <% if @job_invocation.task %>
   <% title_actions(button_group(job_invocation_task_buttons(@job_invocation.task))) %>

data/app/views/job_templates/_custom_tabs.html.erb

@@ -11,10 +11,7 @@
 
   <%= text_f f, :description_format,
              :disabled => @template.locked?,
-             :help_inline => popover(_('Explanation'), _('This template is used to generate the description. ' +
-                                                         'Input values can be used using the syntax %{package}. ' +
-                                                         'You may also include the job category and template ' +
-                                                         'name using %{job_category} and %{template_name}.')) %>
+             :label_help => description_format_help %>
 
   <%= select_f f, :provider_type, providers_options, :first, :last, :disabled => @template.locked? %>
 

data/app/views/overrides/nics/_execution_interface.html.erb

@@ -1,9 +1,8 @@
 <%= checkbox_f(
   f,
   :execution,
-  :help_inline => popover(
-    '', _("The execution interface is used for remote execution"),
-    :rel => 'popover-modal'),
+  :label_help => _("The execution interface is used for remote execution"),
+  :label_help_options => { :rel => 'popover-modal' },
   :label_size => 'col-md-3',
   :label => _('Remote execution'),
   :class => :interface_execution) %>

data/app/views/remote_execution_features/index.html.erb

@@ -12,7 +12,7 @@
   <tbody>
     <% @remote_execution_features.each do |feature| %>
       <tr>
-        <td><%= link_to_if_authorized feature.label, hash_for_remote_execution_feature_path(feature).merge(:auth_object => feature, :permission => :edit_remote_execution_features) %></td>
+        <td><%= link_to_if_authorized feature.label, hash_for_remote_execution_feature_path(feature).merge(:auth_object => feature, :permission => :edit_remote_execution_features, :authorizer => authorizer) %></td>
         <td><%= feature.name %></td>
         <td><%= feature.description %></td>
       </tr>

data/db/migrate/20170110145641_add_host_action_button_to_remote_execution_feature.rb

@@ -0,0 +1,5 @@
+class AddHostActionButtonToRemoteExecutionFeature < ActiveRecord::Migration
+  def change
+    add_column :remote_execution_features, :host_action_button, :boolean, :null => false, :default => false
+  end
+end

data/foreman_remote_execution.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '~> 0.8.10'
   s.add_dependency 'foreman_remote_execution_core'
-  s.add_dependency 'foreman-tasks', '~> 0.8.1'
+  s.add_dependency 'foreman-tasks', '~> 0.9.0'
 
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rdoc'

data/lib/foreman_remote_execution/engine.rb

@@ -31,7 +31,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 1.13'
+        requires_foreman '>= 1.15'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -84,6 +84,8 @@ module ForemanRemoteExecution
         role 'Remote Execution User', USER_PERMISSIONS
         role 'Remote Execution Manager', MANAGER_PERMISSIONS
 
+        add_all_permissions_to_default_roles
+
         # add menu entry
         menu :top_menu, :job_templates,
              url_hash: { controller: :job_templates, action: :index },

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/locale/action_names.rb

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

data/locale/de/foreman_remote_execution.po

@@ -97,8 +97,8 @@ msgstr "Parallelitätsebene"
 msgid "Control concurrency level and distribution over time"
 msgstr "Parallelitätsebene und zeitliche Verteilung steuern"
 
-msgid "Could not use any proxy. Consider configuring %{global_proxy} or %{fallback_proxy} in settings"
-msgstr "Es konnte kein Proxy verwendet werden. Erwägen Sie %{global_proxy} oder %{fallback_proxy} in den Einstellungen zu konfigurieren"
+msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
+msgstr ""
 
 msgid "Could not use any template used in the job invocation"
 msgstr "Es konnte keine Vorlage aus dem Jobaufruf verwendet werden"
@@ -118,9 +118,6 @@ msgstr "Wiederholten Job erstellen"
 msgid "Create a template input"
 msgstr "Vorlageneingabe erstellen"
 
-msgid "Create architecture"
-msgstr "Architektur erstellen"
-
 msgid "Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."
 msgstr "Standardbenutzer für SSH. Kann für jeden Host einzeln überschrieben werden, indem Sie ein Parameter namens remote_execution_ssh_user bestimmen."
 
@@ -136,9 +133,6 @@ msgstr "Job-Vorlage löschen"
 msgid "Delete a template input"
 msgstr "Vorlageneingabe löschen"
 
-msgid "Delete architecture"
-msgstr "Architektur löschen"
-
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -211,9 +205,6 @@ msgstr "Fehlgeschlagen"
 msgid "Failed rendering template: %s"
 msgstr "Rendern der Vorlage fehlgeschlagen: %s"
 
-msgid "Failed to initialize command"
-msgstr "Initialisieren des Befehls fehlgeschlagen"
-
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr "Funktionseingabe %{input_name} nicht definiert in Vorlage %{template_name}"
 
@@ -262,9 +253,6 @@ msgstr ""
 msgid "Indicates that the action should be cancelled if it cannot be started before this time."
 msgstr "Gibt an, dass die Aktion abgebrochen werden soll, wenn sie nicht vor diesem Zeitpunkt gestartet werden kann."
 
-msgid "Initialization error: %s"
-msgstr "Initialisierungsfehler: %s"
-
 msgid "Input"
 msgstr "Eingabe"
 
@@ -391,9 +379,6 @@ msgstr "Noch keine Ausführung abgeschlossen"
 msgid "No hosts found."
 msgstr "Keine Hosts gefunden"
 
-msgid "No output"
-msgstr "Keine Ausgabe"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "Der Funktion %{feature_name} wurde keine Vorlage zugewiesen"
 
@@ -418,6 +403,12 @@ msgstr "Ausstehend"
 msgid "Perform no more executions after this time"
 msgstr "Danach nicht mehr ausführen"
 
+msgid "Playbook execution failed"
+msgstr ""
+
+msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
+msgstr ""
+
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -511,9 +502,6 @@ msgstr "Job zu einem zukünftigen Zeitpunkt starten lassen"
 msgid "Schedule the job to start at a later time"
 msgstr "Job zu einer späteren Zeit starten lassen"
 
-msgid "Script execution failed"
-msgstr "Ausführung des Skripts fehlgeschlagen"
-
 msgid "Scroll to bottom"
 msgstr "Zum Ende scrollen"
 
@@ -699,9 +687,6 @@ msgstr "Job-Vorlage aktualisieren"
 msgid "Update a template input"
 msgstr "Vorlageneingabe aktualisieren"
 
-msgid "Update architecture"
-msgstr "Architektur aktualisieren"
-
 msgid "Use default description template"
 msgstr "Standardbeschreibungsvorlage verwenden"
 
@@ -735,6 +720,11 @@ msgstr "Welcher Benutzer zur Ausführung des Skripts verwendet werden soll (mitt
 msgid "What user should be used to run the script (using sudo-like mechanisms). Defaults to a template parameter or global setting."
 msgstr "Welcher Benutzer zur Ausführung des Skripts (mittels sudo-ähnlichen Mechanismen) verwendet werden soll. Standardmäßig wird ein Vorlagenparameter oder eine allgemeine Einstellung verwendet."
 
+msgid ""
+"When enabled, the remote execution will try to run the commands directly, when no\n"
+"                     proxy with remote execution feature is configured for the host."
+msgstr ""
+
 msgid "Whether it should be allowed to override the effective user from the invocation form."
 msgstr "Ob es möglich sein soll, den effektiven Benutzer des Aufruf-Formulars außer Kraft zu setzen."
 

data/locale/en/foreman_remote_execution.po

@@ -98,7 +98,7 @@ msgstr ""
 msgid "Control concurrency level and distribution over time"
 msgstr ""
 
-msgid "Could not use any proxy. Consider configuring %{global_proxy} or %{fallback_proxy} in settings"
+msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
 msgstr ""
 
 msgid "Could not use any template used in the job invocation"
@@ -119,9 +119,6 @@ msgstr ""
 msgid "Create a template input"
 msgstr ""
 
-msgid "Create architecture"
-msgstr ""
-
 msgid "Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."
 msgstr ""
 
@@ -137,9 +134,6 @@ msgstr ""
 msgid "Delete a template input"
 msgstr ""
 
-msgid "Delete architecture"
-msgstr ""
-
 msgid "Description"
 msgstr ""
 
@@ -212,9 +206,6 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
-msgid "Failed to initialize command"
-msgstr ""
-
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr ""
 
@@ -263,9 +254,6 @@ msgstr ""
 msgid "Indicates that the action should be cancelled if it cannot be started before this time."
 msgstr ""
 
-msgid "Initialization error: %s"
-msgstr ""
-
 msgid "Input"
 msgstr ""
 
@@ -392,9 +380,6 @@ msgstr ""
 msgid "No hosts found."
 msgstr ""
 
-msgid "No output"
-msgstr ""
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr ""
 
@@ -419,6 +404,12 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr ""
 
+msgid "Playbook execution failed"
+msgstr ""
+
+msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
+msgstr ""
+
 msgid "Preview"
 msgstr ""
 
@@ -512,9 +503,6 @@ msgstr ""
 msgid "Schedule the job to start at a later time"
 msgstr ""
 
-msgid "Script execution failed"
-msgstr ""
-
 msgid "Scroll to bottom"
 msgstr ""
 
@@ -700,9 +688,6 @@ msgstr ""
 msgid "Update a template input"
 msgstr ""
 
-msgid "Update architecture"
-msgstr ""
-
 msgid "Use default description template"
 msgstr ""
 
@@ -736,6 +721,11 @@ msgstr ""
 msgid "What user should be used to run the script (using sudo-like mechanisms). Defaults to a template parameter or global setting."
 msgstr ""
 
+msgid ""
+"When enabled, the remote execution will try to run the commands directly, when no\n"
+"                     proxy with remote execution feature is configured for the host."
+msgstr ""
+
 msgid "Whether it should be allowed to override the effective user from the invocation form."
 msgstr ""