foreman_remote_execution 3.0.2 → 3.2.2

data/db/seeds.d/90-bookmarks.rb

@@ -10,6 +10,7 @@ Bookmark.without_auditing do
     next if Bookmark.where(:controller => 'job_invocations').find_by(name: input[:name])
     # TODO audit should be fixed once core #13109 gets merged
     next if SeedHelper.audit_modified? Bookmark, input[:name]
+
     attributes = { :public => true }.merge(input)
     b = Bookmark.where(:name => input[:name], :controller => input[:controller]).first || Bookmark.new
     b.attributes = attributes

data/extra/cockpit/foreman-cockpit-session

@@ -44,9 +44,11 @@ end
 def read_control
   size = $stdin.readline.chomp.to_i
   raise ArgumentError, "Invalid frame: invalid size" if size.zero?
+
   data = $stdin.read(size)
   LOG.debug("Received control message #{data.lstrip}")
   raise ArgumentError, "Invalid frame: too short" if data.nil? || data.length < size
+
   JSON.parse(data)
 end
 
@@ -67,6 +69,7 @@ def read_auth_reply
   cmd = read_control
   response = cmd["response"]
   raise ArgumentError, "Did not receive a valid authorize command" if cmd["command"] != "authorize" || !response
+
   response
 end
 
@@ -112,8 +115,8 @@ def foreman_call(path, token)
     return JSON.parse(res.body)
   when "401"
     exit_with_problem("authentication-failed",
-                      "Token was not valid",
-                      { "password" => "not-tried", "token" => "denied" })
+      "Token was not valid",
+      { "password" => "not-tried", "token" => "denied" })
   when "404"
     return nil
   else
@@ -135,6 +138,7 @@ def ssh_read_and_handle_response_header(sock, url, params)
   loop do
     line = sock.readline
     break unless line && (line != "\r\n")
+
     header += line
   end
 
@@ -262,6 +266,7 @@ def ssh_with_proxy(proxy, params)
     end
 
     next unless w.include?($stdout)
+
     n = $stdout.write(out_buf)
     $stdout.flush
     out_buf = out_buf[n..-1]

data/foreman_remote_execution.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency 'deface'
-  s.add_dependency 'dynflow', '>= 1.0.1', '< 2.0.0'
+  s.add_dependency 'dynflow', '>= 1.0.2', '< 2.0.0'
   s.add_dependency 'foreman_remote_execution_core'
   s.add_dependency 'foreman-tasks', '>= 0.15.1'
 

data/lib/foreman_remote_execution/engine.rb

@@ -78,7 +78,7 @@ module ForemanRemoteExecution
           permission :cancel_job_invocations, { :job_invocations => [:cancel], 'api/v2/job_invocations' => [:cancel] }, :resource_type => 'JobInvocation'
           # this permissions grants user to get auto completion hints when setting up filters
           permission :filter_autocompletion_for_template_invocation, { :template_invocations => [ :auto_complete_search, :index ] },
-                     :resource_type => 'TemplateInvocation'
+            :resource_type => 'TemplateInvocation'
           permission :cockpit_hosts, { 'cockpit' => [:redirect, :host_ssh_params] }, :resource_type => 'Host'
         end
 
@@ -88,7 +88,7 @@ module ForemanRemoteExecution
           :create_job_invocations,
           :create_template_invocations,
           :view_hosts,
-          :view_smart_proxies
+          :view_smart_proxies,
         ].freeze
         MANAGER_PERMISSIONS = USER_PERMISSIONS + [
           :cancel_job_invocations,
@@ -98,32 +98,32 @@ module ForemanRemoteExecution
           :lock_job_templates,
           :view_audit_logs,
           :filter_autocompletion_for_template_invocation,
-          :edit_remote_execution_features
+          :edit_remote_execution_features,
         ]
 
         # Add a new role called 'Remote Execution User ' if it doesn't exist
-        role 'Remote Execution User', USER_PERMISSIONS
-        role 'Remote Execution Manager', MANAGER_PERMISSIONS
+        role 'Remote Execution User', USER_PERMISSIONS, 'Role with permissions to run remote execution jobs against hosts'
+        role 'Remote Execution Manager', MANAGER_PERMISSIONS, 'Role with permissions to manage job templates, remote execution features, cancel jobs and view audit logs'
 
         add_all_permissions_to_default_roles
 
         # add menu entry
         menu :top_menu, :job_templates,
-             url_hash: { controller: :job_templates, action: :index },
-             caption: N_('Job templates'),
-             parent: :hosts_menu,
-             after: :provisioning_templates
+          url_hash: { controller: :job_templates, action: :index },
+          caption: N_('Job templates'),
+          parent: :hosts_menu,
+          after: :provisioning_templates
         menu :admin_menu, :remote_execution_features,
-             url_hash: { controller: :remote_execution_features, action: :index },
-             caption: N_('Remote Execution Features'),
-             parent: :administer_menu,
-             after: :bookmarks
+          url_hash: { controller: :remote_execution_features, action: :index },
+          caption: N_('Remote Execution Features'),
+          parent: :administer_menu,
+          after: :bookmarks
 
         menu :top_menu, :job_invocations,
-             url_hash: { controller: :job_invocations, action: :index },
-             caption: N_('Jobs'),
-             parent: :monitor_menu,
-             after: :audits
+          url_hash: { controller: :job_invocations, action: :index },
+          caption: N_('Jobs'),
+          parent: :monitor_menu,
+          after: :audits
 
         register_custom_status HostStatus::ExecutionStatus
         # add dashboard widget
@@ -135,6 +135,7 @@ module ForemanRemoteExecution
         end
 
         extend_rabl_template 'api/v2/smart_proxies/main', 'api/v2/smart_proxies/pubkey'
+        describe_host { overview_buttons_provider :host_overview_buttons }
       end
     end
 
@@ -165,10 +166,12 @@ module ForemanRemoteExecution
 
       Host::Managed.prepend ForemanRemoteExecution::HostExtensions
       Host::Managed.include ForemanTasks::Concerns::HostActionSubject
+      Host::Managed.include ForemanRemoteExecution::Orchestration::SSH
 
       (Nic::Base.descendants + [Nic::Base]).each do |klass|
         klass.send(:include, ForemanRemoteExecution::NicExtensions)
       end
+      Nic::Managed.include ForemanRemoteExecution::Orchestration::SSH
 
       Bookmark.include ForemanRemoteExecution::BookmarkExtensions
       HostsHelper.prepend ForemanRemoteExecution::HostsHelperExtensions

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.2.2'.freeze
 end

data/locale/action_names.rb

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

data/locale/de/foreman_remote_execution.po

@@ -27,11 +27,6 @@ msgstr "vor %s"
 msgid "%{description} on %{host}"
 msgstr "%{description} auf %{host}"
 
-msgid "...and %{count} more"
-msgid_plural "...and %{count} more"
-msgstr[0] "...und %{count} weiteren"
-msgstr[1] "...und %{count} weiteren"
-
 msgid "A comma separated list of input names to be excluded from the foreign template."
 msgstr "Kommagetrennte Liste von Eingabenamen, die aus der Fremdvorlage auszuschließen ist"
 
@@ -59,12 +54,21 @@ msgstr "Aktionen"
 msgid "Add Foreign Input Set"
 msgstr "Fremdeingabe-Satz hinzufügen"
 
+msgid "Alphabetical"
+msgstr ""
+
 msgid "Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required."
 msgstr ""
 
 msgid "Another interface is already set as execution. Are you sure you want to use this one instead?"
 msgstr "Es ist bereits eine andere Schnittstelle für die Ausführung bestimmt. Sind Sie sicher, dass Sie stattdessen diese Schnittstelle verwenden möchten?"
 
+msgid "Any Location"
+msgstr ""
+
+msgid "Any Organization"
+msgstr ""
+
 msgid "Back to Job"
 msgstr "Zurück zum Job"
 
@@ -92,6 +96,9 @@ msgstr "bookmark_id und search_query konnte nicht angegeben werden"
 msgid "Cannot specify both recurrence and scheduling"
 msgstr "Wiederholung und Planung konnten nicht angegeben werden"
 
+msgid "Choose a job template that is pre-selected in job invocation form"
+msgstr ""
+
 msgid "Circular dependency detected in foreign input set '%{template}' -> '%{target_template}'. Templates stack: %{templates_stack}"
 msgstr "Zirkuläre Abhängigkeit im Fremdeingabe-Satz gefunden '%{template}' -> '%{target_template}'. Vorlagen-Stack: %{templates_stack}"
 
@@ -146,6 +153,12 @@ msgstr "Job-Vorlage erstellen"
 msgid "Create a recurring job"
 msgstr "Wiederholten Job erstellen"
 
+msgid "Current location %{loc_c} is different from job's location %{loc_j}."
+msgstr ""
+
+msgid "Current organization %{org_c} is different from job's organization %{org_j}."
+msgstr ""
+
 msgid "Default SSH key passphrase"
 msgstr ""
 
@@ -179,8 +192,8 @@ msgstr "Beschreibungsvorlage"
 msgid "Display advanced fields"
 msgstr "Erweiterte Felder einblenden"
 
-msgid "Distribute execution over N seconds"
-msgstr "Ausführung über n Sekunden verteilen"
+msgid "Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
 
 msgid "Distribute tasks over N seconds"
 msgstr "Aufgaben über n Sekunden verteilen"
@@ -224,9 +237,21 @@ msgstr "Fehler die Daten vom Proxy zu laden."
 msgid "Evaluated at:"
 msgstr "Evaluiert an:"
 
+msgid "Execute the jobs on hosts in randomized order"
+msgstr ""
+
 msgid "Execution"
 msgstr "Ausführung"
 
+msgid "Execution order"
+msgstr ""
+
+msgid "Execution ordering"
+msgstr ""
+
+msgid "Execution ordering determines whether the jobs should be executed on hosts in alphabetical order or in randomized order.<br><ul><li><b>Ordered</b> - executes the jobs on hosts in alphabetical order</li><li><b>Randomized</b> - randomizes the order in which jobs are executed on hosts</li></ul>"
+msgstr ""
+
 msgid "Exit status: %s"
 msgstr "Exit-Status: %s"
 
@@ -257,6 +282,9 @@ msgstr "Fremdeingabe-Satz"
 msgid "Foreman can run arbitrary commands on remote hosts using different providers, such as SSH or Ansible. Communication goes through the Smart Proxy so Foreman does not have to have direct access to the target hosts and can scale to control many hosts."
 msgstr ""
 
+msgid "Form Job Template"
+msgstr ""
+
 msgid "Get output for a host"
 msgstr "Ausgabe für einen Host abfragen"
 
@@ -377,6 +405,9 @@ msgstr ""
 msgid "Label"
 msgstr "Kennung"
 
+msgid "Last execution cancelled"
+msgstr ""
+
 msgid "Last execution failed"
 msgstr "Letzte Ausführung fehlgeschlagen"
 
@@ -407,6 +438,9 @@ msgstr "Entfernte Ausführungsfunktionen auflisten"
 msgid "List template invocations belonging to job invocation"
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
 msgid "Manual selection"
 msgstr "Manuelle Auswahl"
 
@@ -425,15 +459,15 @@ msgstr "Neue Job-Vorlage"
 msgid "No execution finished yet"
 msgstr "Noch keine Ausführung abgeschlossen"
 
-msgid "No hosts found."
-msgstr "Keine Hosts gefunden"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "Der Funktion %{feature_name} wurde keine Vorlage zugewiesen"
 
 msgid "Not all required inputs have values. Missing inputs: %s"
 msgstr "Nicht alle erforderlichen Eingaben haben Werte. Fehlende Eingaben: %s"
 
+msgid "Organization"
+msgstr ""
+
 msgid "Override the description format from the template for this invocation only"
 msgstr "Beschreibungsformat der Vorlage nur für diesen Aufruf außer Kraft setzen "
 
@@ -458,6 +492,9 @@ msgstr ""
 msgid "Pending"
 msgstr "Ausstehend"
 
+msgid "Perform a single Puppet run"
+msgstr ""
+
 msgid "Perform no more executions after this time"
 msgstr "Danach nicht mehr ausführen"
 
@@ -487,6 +524,9 @@ msgstr "Anbieter und Vorlagen"
 msgid "Proxies"
 msgstr "Proxys"
 
+msgid "Randomized"
+msgstr ""
+
 msgid "Recurring logic"
 msgstr "Wiederholungslogik"
 
@@ -511,6 +551,9 @@ msgstr "Entfernte Ausführung"
 msgid "Remote execution feature label that should be triggered, job template assigned to this feature will be used"
 msgstr ""
 
+msgid "Remove SSH known hosts for %s"
+msgstr ""
+
 msgid "Repeat a maximum of N times"
 msgstr "Maximal n-mal wiederholen"
 
@@ -544,9 +587,15 @@ msgstr "Ausführen"
 msgid "Run Job"
 msgstr "Job ausführen"
 
+msgid "Run Puppet Once"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "Höchstens n Aufgaben gleichzeitig ausführen"
 
+msgid "Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
+
 msgid "SSH"
 msgstr "SSH"
 
@@ -589,8 +638,8 @@ msgstr "Suchen"
 msgid "Search Query"
 msgstr ""
 
-msgid "Search for remote execution proxy outside of the proxies assigned to the host. If locations or organizations are enabled, the search will be limited to the host's organization or location."
-msgstr "Außerhalb der dem Host zugewiesenen Proxys nach Proxy mit entfernter Ausführung suchen. Wenn Standorte oder Organisationen aktiviert sind, wird die Suche auf Organisation oder Standort des Hosts begrenzt."
+msgid "Search for remote execution proxy outside of the proxies assigned to the host. The search will be limited to the host's organization and location."
+msgstr ""
 
 msgid "Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy"
 msgstr "Den Host nach einem Proxy mit entfernter Ausführung durchsuchen. Dies ist nützlich, wenn der Host kein Subnetz hat oder das Subnetz keinen Proxy für die Ausführung hat."
@@ -610,7 +659,7 @@ msgstr "Wählen Sie so viele Proxys für entfernte Ausführung aus, wie es für
 msgid "Set to distribute over"
 msgstr ""
 
-msgid "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."
+msgid "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. This setting only applies to IPv4. When the host has only an IPv6 address on the interface used for remote execution, hostname will be used even if this setting is set to true."
 msgstr ""
 
 msgid "Show foreign input set details"
@@ -682,9 +731,6 @@ msgstr "Vorlagenversion"
 msgid "Template with id '%{id}' was not found"
 msgstr "Vorlage mit ID '%{id}' nicht gefunden"
 
-msgid "The dynamic query '#{job_invocation.targeting.search_query}' was not resolved yet. The list of hosts to which it would resolve now can be seen"
-msgstr ""
-
 msgid "The dynamic query '%{query}' was not resolved yet. The list of hosts to which it would resolve now can be seen %{here}."
 msgstr "Die dynamische Anfrage '%{query}' wurde noch nicht aufgelöst. Die Liste von Hosts, zu denen sie sich auflösen würde, ist jetzt %{here} zu sehen."
 
@@ -786,6 +832,9 @@ msgstr "Anfragetyp"
 msgid "Unable to fetch public key"
 msgstr "Öffentlicher Schlüssel konnte nicht abgerufen werden"
 
+msgid "Unable to remove host from known hosts"
+msgstr ""
+
 msgid "Unable to save template. Correct highlighted errors"
 msgstr "Vorlage kann nicht gespeichert werden. Bitte korrigieren Sie die markierten Fehler"
 

data/locale/en/foreman_remote_execution.po

@@ -26,12 +26,6 @@ msgstr ""
 msgid "%{description} on %{host}"
 msgstr ""
 
-#, fuzzy
-msgid "...and %{count} more"
-msgid_plural "...and %{count} more"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "A comma separated list of input names to be excluded from the foreign template."
 msgstr ""
 
@@ -59,12 +53,21 @@ msgstr ""
 msgid "Add Foreign Input Set"
 msgstr ""
 
+msgid "Alphabetical"
+msgstr ""
+
 msgid "Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required."
 msgstr ""
 
 msgid "Another interface is already set as execution. Are you sure you want to use this one instead?"
 msgstr ""
 
+msgid "Any Location"
+msgstr ""
+
+msgid "Any Organization"
+msgstr ""
+
 msgid "Back to Job"
 msgstr ""
 
@@ -92,6 +95,9 @@ msgstr ""
 msgid "Cannot specify both recurrence and scheduling"
 msgstr ""
 
+msgid "Choose a job template that is pre-selected in job invocation form"
+msgstr ""
+
 msgid "Circular dependency detected in foreign input set '%{template}' -> '%{target_template}'. Templates stack: %{templates_stack}"
 msgstr ""
 
@@ -146,6 +152,12 @@ msgstr ""
 msgid "Create a recurring job"
 msgstr ""
 
+msgid "Current location %{loc_c} is different from job's location %{loc_j}."
+msgstr ""
+
+msgid "Current organization %{org_c} is different from job's organization %{org_j}."
+msgstr ""
+
 msgid "Default SSH key passphrase"
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Display advanced fields"
 msgstr ""
 
-msgid "Distribute execution over N seconds"
+msgid "Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
 msgstr ""
 
 msgid "Distribute tasks over N seconds"
@@ -224,9 +236,21 @@ msgstr ""
 msgid "Evaluated at:"
 msgstr ""
 
+msgid "Execute the jobs on hosts in randomized order"
+msgstr ""
+
 msgid "Execution"
 msgstr ""
 
+msgid "Execution order"
+msgstr ""
+
+msgid "Execution ordering"
+msgstr ""
+
+msgid "Execution ordering determines whether the jobs should be executed on hosts in alphabetical order or in randomized order.<br><ul><li><b>Ordered</b> - executes the jobs on hosts in alphabetical order</li><li><b>Randomized</b> - randomizes the order in which jobs are executed on hosts</li></ul>"
+msgstr ""
+
 msgid "Exit status: %s"
 msgstr ""
 
@@ -257,6 +281,9 @@ msgstr ""
 msgid "Foreman can run arbitrary commands on remote hosts using different providers, such as SSH or Ansible. Communication goes through the Smart Proxy so Foreman does not have to have direct access to the target hosts and can scale to control many hosts."
 msgstr ""
 
+msgid "Form Job Template"
+msgstr ""
+
 msgid "Get output for a host"
 msgstr ""
 
@@ -377,6 +404,9 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
+msgid "Last execution cancelled"
+msgstr ""
+
 msgid "Last execution failed"
 msgstr ""
 
@@ -407,6 +437,9 @@ msgstr ""
 msgid "List template invocations belonging to job invocation"
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
 msgid "Manual selection"
 msgstr ""
 
@@ -425,15 +458,15 @@ msgstr ""
 msgid "No execution finished yet"
 msgstr ""
 
-msgid "No hosts found."
-msgstr ""
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr ""
 
 msgid "Not all required inputs have values. Missing inputs: %s"
 msgstr ""
 
+msgid "Organization"
+msgstr ""
+
 msgid "Override the description format from the template for this invocation only"
 msgstr ""
 
@@ -458,6 +491,9 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
+msgid "Perform a single Puppet run"
+msgstr ""
+
 msgid "Perform no more executions after this time"
 msgstr ""
 
@@ -485,6 +521,9 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
+msgid "Randomized"
+msgstr ""
+
 msgid "Recurring logic"
 msgstr ""
 
@@ -509,6 +548,9 @@ msgstr ""
 msgid "Remote execution feature label that should be triggered, job template assigned to this feature will be used"
 msgstr ""
 
+msgid "Remove SSH known hosts for %s"
+msgstr ""
+
 msgid "Repeat a maximum of N times"
 msgstr ""
 
@@ -542,9 +584,15 @@ msgstr ""
 msgid "Run Job"
 msgstr ""
 
+msgid "Run Puppet Once"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr ""
 
+msgid "Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
+
 msgid "SSH"
 msgstr ""
 
@@ -587,7 +635,7 @@ msgstr ""
 msgid "Search Query"
 msgstr ""
 
-msgid "Search for remote execution proxy outside of the proxies assigned to the host. If locations or organizations are enabled, the search will be limited to the host's organization or location."
+msgid "Search for remote execution proxy outside of the proxies assigned to the host. The search will be limited to the host's organization and location."
 msgstr ""
 
 msgid "Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy"
@@ -608,7 +656,7 @@ msgstr ""
 msgid "Set to distribute over"
 msgstr ""
 
-msgid "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."
+msgid "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. This setting only applies to IPv4. When the host has only an IPv6 address on the interface used for remote execution, hostname will be used even if this setting is set to true."
 msgstr ""
 
 msgid "Show foreign input set details"
@@ -680,9 +728,6 @@ msgstr ""
 msgid "Template with id '%{id}' was not found"
 msgstr ""
 
-msgid "The dynamic query '#{job_invocation.targeting.search_query}' was not resolved yet. The list of hosts to which it would resolve now can be seen"
-msgstr ""
-
 msgid "The dynamic query '%{query}' was not resolved yet. The list of hosts to which it would resolve now can be seen %{here}."
 msgstr ""
 
@@ -784,6 +829,9 @@ msgstr ""
 msgid "Unable to fetch public key"
 msgstr ""
 
+msgid "Unable to remove host from known hosts"
+msgstr ""
+
 msgid "Unable to save template. Correct highlighted errors"
 msgstr ""