foreman_remote_execution 13.0.0 → 13.1.1

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -204,20 +204,6 @@ module Actions
         host.refresh_global_status!
       end
 
-      def delegated_output
-        if input[:delegated_action_id]
-          super
-        elsif phase?(Present)
-          # for compatibility with old actions
-          old_action = all_planned_actions.first
-          if old_action
-            old_action.output.fetch('proxy_output', {})
-          else
-            {}
-          end
-        end
-      end
-
       def verify_permissions(host, template_invocation)
         raise _('User can not execute job on host %s') % host.name unless User.current.can?(:view_hosts, host)
         raise _('User can not execute this job template') unless User.current.can?(:view_job_templates, template_invocation.template)

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -152,3 +152,11 @@ module ForemanRemoteExecution
     end
   end
 end
+
+module Host
+  class Managed
+    class Jail < Safemode::Jail
+      allow :execution_interface
+    end
+  end
+end

data/app/models/job_invocation_composer.rb

@@ -569,9 +569,10 @@ class JobInvocationComposer
   # builds input values for a given templates id based on params
   # omits inputs that belongs to unavailable templates
   def build_input_values_for(template_invocation, job_template_base)
-    template_invocation.input_values = job_template_base.fetch('input_values', {}).map do |attributes|
-      input = template_invocation.template.template_inputs_with_foreign.find { |i| i.id.to_s == attributes[:template_input_id].to_s }
-      input ? input.template_invocation_input_values.build(attributes) : nil
+    template_invocation.input_values = template_invocation.template.template_inputs_with_foreign.map do |input|
+      attributes = job_template_base.fetch('input_values', {}).find { |i| i[:template_input_id].to_s == input.id.to_s }
+      attributes = { "template_input_id" => input.id, "value" => input.default } if attributes.nil? && input.default
+      attributes ? input.template_invocation_input_values.build(attributes) : nil
     end.compact
     template_invocation.provider_input_values.build job_template_base.fetch('provider_input_values', [])
   end

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

@@ -8,11 +8,13 @@ node do |invocation|
     :template_id => pattern_template&.template_id,
     :template_name => pattern_template&.template_name,
     :effective_user => pattern_template&.effective_user,
-    :succeeded => invocation_count(invocation, :output_key => :success_count),
-    :failed    => invocation_count(invocation, :output_key => :failed_count),
-    :pending   => invocation_count(invocation, :output_key => :pending_count),
+    :succeeded => invocation.progress_report[:success],
+    :failed    => invocation.progress_report[:error],
+    :pending   => invocation.progress_report[:pending],
+    :cancelled => invocation.progress_report[:cancelled],
     :total     => invocation_count(invocation, :output_key => :total_count),
     :missing   => invocation.missing_hosts_count,
+    :total_hosts => invocation.total_hosts_count,
   }
 end
 

data/app/views/templates/script/convert2rhel_analyze.erb

@@ -1,15 +1,6 @@
 <%#
 name: Convert2RHEL analyze
 snippet: false
-template_inputs:
-  - name: Data telemetry
-    required: false
-    input_type: user
-    options: "yes\r\nno"
-    advanced: false
-    value_type: plain
-    default: 'yes'
-    hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: script
@@ -25,9 +16,7 @@ if ! rpm -q convert2rhel &> /dev/null; then
   yum install -y convert2rhel
 fi
 
-<% if input('Data telemetry') != "yes" -%>
-export CONVERT2RHEL_DISABLE_TELEMETRY=1
-<% end -%>
+export CONVERT2RHEL_THROUGH_FOREMAN=1
 
 /usr/bin/convert2rhel analyze -y
 

data/app/views/templates/script/package_action.erb

@@ -66,6 +66,7 @@ exit_with_message () {
 <% if package_manager == 'zypper' -%>
 handle_zypp_res_codes () {
   RETVAL=$1
+  ACTION=$2
 
   # See https://github.com/openSUSE/zypper/blob/master/src/main.h
   declare -A ZYPP_RES_CODES
@@ -83,6 +84,8 @@ handle_zypp_res_codes () {
   fi
   if [[ $RETVAL -ge 100 && $RETVAL -le 103 ]]; then
     RETVAL=0
+  elif [ "$ACTION" = "remove" ] && [ "$RETVAL" -eq 104 ]; then
+    RETVAL=0
   fi
 
   return $RETVAL
@@ -115,9 +118,19 @@ handle_zypp_res_codes () {
       end
     end
   -%>
+  OUTFILE=$(mktemp)
+  trap "rm -f $OUTFILE" EXIT
+  set -o pipefail
   export DEBIAN_FRONTEND=noninteractive
   apt-get -y update
-  apt-get -o APT::Get::Upgrade-Allow-New="true" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= input("options") %> <%= action %> <%= input("package") %>
+  LANG=C apt-get -o APT::Get::Upgrade-Allow-New="true" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= input("options") %> <%= action %> <%= input("package") %> 2>&1 | tee $OUTFILE
+  RETVAL=$?
+  if grep -q "Unable to locate" $OUTFILE && [ "$action" = "remove" ]; then
+    true
+  else
+    setReturnValue() { RETVAL=$1; return $RETVAL; }
+    setReturnValue $RETVAL
+  fi
 <% elsif package_manager == 'zypper' -%>
   <%-
     if action == "group install"
@@ -128,7 +141,7 @@ handle_zypp_res_codes () {
   -%>
   zypper refresh
   zypper -n <%= action %> <%= input("options") %> <%= input("package") %>
-  handle_zypp_res_codes $?
+  handle_zypp_res_codes $? $action
 <% end -%>
 RETVAL=$?
 [ $RETVAL -eq 0 ] || exit_with_message "Package action failed" $RETVAL

data/app/views/templates/script/puppet_run_once.erb

@@ -12,7 +12,7 @@ template_inputs:
   required: false
 feature: puppet_run_host
 %>
-<% if @host.operatingsystem.family == 'Debian' -%>
-export PATH=/opt/puppetlabs/bin:$PATH
-<% end -%>
+if [ -f /etc/profile.d/puppet-agent.sh ]; then
+  . /etc/profile.d/puppet-agent.sh
+fi
 puppet agent --onetime --no-usecacheonfailure --no-daemonize <%= input("puppet_options") %>

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '13.0.0'.freeze
+  VERSION = '13.1.1'.freeze
 end

data/locale/de/foreman_remote_execution.po

@@ -22,6 +22,9 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr "%s"
 
@@ -156,6 +159,9 @@ msgstr "Job abbrechen"
 msgid "Cancel job invocation"
 msgstr "Job-Aufruf abbrechen"
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -441,6 +447,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr "Rendern der Vorlage fehlgeschlagen: %s"
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr "Fallback auf einen beliebigen Proxy"
 
@@ -543,6 +552,9 @@ msgstr "Import"
 msgid "Import a job template from ERB"
 msgstr "Job-Vorlage aus ERB importieren"
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr "Alle Eingaben aus Fremdvorlage einschließen"
 
@@ -1040,12 +1052,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr "Geplant"
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr "Geplanter Start um"
 
 msgid "Scheduled to start before"
 msgstr "Geplanter Start vor"
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr "Skript"
 
@@ -1190,6 +1208,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr "Erfolgreich"
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Erfolg"
 
@@ -1199,6 +1220,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr "Synchronisations Job-Vorlage"
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr "Zielhosts"
 

data/locale/en/foreman_remote_execution.po

@@ -17,6 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr ""
 
@@ -151,6 +154,9 @@ msgstr ""
 msgid "Cancel job invocation"
 msgstr ""
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr ""
 
@@ -436,6 +442,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr ""
 
@@ -538,6 +547,9 @@ msgstr ""
 msgid "Import a job template from ERB"
 msgstr ""
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr ""
 
@@ -1033,12 +1045,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr ""
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr ""
 
 msgid "Scheduled to start before"
 msgstr ""
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr ""
 
@@ -1183,6 +1201,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr ""
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr ""
 
@@ -1192,6 +1213,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr ""
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr ""
 

data/locale/en_GB/foreman_remote_execution.po

@@ -18,6 +18,9 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr ""
 
@@ -152,6 +155,9 @@ msgstr ""
 msgid "Cancel job invocation"
 msgstr ""
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr ""
 
@@ -437,6 +443,9 @@ msgstr ""
 msgid "Failed rendering template: %s"
 msgstr ""
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr ""
 
@@ -539,6 +548,9 @@ msgstr ""
 msgid "Import a job template from ERB"
 msgstr ""
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr ""
 
@@ -1034,12 +1046,18 @@ msgstr ""
 msgid "Scheduled"
 msgstr ""
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr ""
 
 msgid "Scheduled to start before"
 msgstr ""
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr ""
 
@@ -1184,6 +1202,9 @@ msgstr ""
 msgid "Succeeded"
 msgstr ""
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Success"
 
@@ -1193,6 +1214,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr ""
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr ""
 

data/locale/es/foreman_remote_execution.po

@@ -18,6 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
+msgid "${d.title} ${d.count} hosts"
+msgstr ""
+
 msgid "%s"
 msgstr "%s"
 
@@ -152,6 +155,9 @@ msgstr "Cancelar tarea"
 msgid "Cancel job invocation"
 msgstr "Cancelar invocación de trabajo"
 
+msgid "Canceled:"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -437,6 +443,9 @@ msgstr "Anfitriones fallidos"
 msgid "Failed rendering template: %s"
 msgstr "Falló la reproducción de la plantilla: %s."
 
+msgid "Failed:"
+msgstr ""
+
 msgid "Fallback to Any Proxy"
 msgstr "Acción de reserva en cualquier proxy"
 
@@ -539,6 +548,9 @@ msgstr "Importar"
 msgid "Import a job template from ERB"
 msgstr "Importar una plantilla de trabajo desde ERB"
 
+msgid "In Progress:"
+msgstr ""
+
 msgid "Include all inputs from the foreign template"
 msgstr "Incluir todas las entradas de la plantilla externa"
 
@@ -1034,12 +1046,18 @@ msgstr "Tipo de horario"
 msgid "Scheduled"
 msgstr "Programado"
 
+msgid "Scheduled at:"
+msgstr ""
+
 msgid "Scheduled to start at"
 msgstr "Programado para comenzar a las"
 
 msgid "Scheduled to start before"
 msgstr "Programado para iniciar antes"
 
+msgid "Scheduled: ${totalHosts} hosts"
+msgstr ""
+
 msgid "Script"
 msgstr "Guión"
 
@@ -1184,6 +1202,9 @@ msgstr "Suscríbase a mis trabajos con éxito"
 msgid "Succeeded"
 msgstr "exitoso"
 
+msgid "Succeeded:"
+msgstr ""
+
 msgid "Success"
 msgstr "Éxito"
 
@@ -1193,6 +1214,12 @@ msgstr ""
 msgid "Sync Job Templates"
 msgstr "Sincronizar plantillas de trabajo"
 
+msgid "System status"
+msgstr ""
+
+msgid "Systems"
+msgstr ""
+
 msgid "Target hosts"
 msgstr "Hosts de destino"