foreman_puppet 6.2.0 → 7.0.0

data/app/assets/javascripts/foreman_puppet/locale/sv_SE/foreman_puppet.js

@@ -811,6 +811,42 @@
       "Error!": [
         ""
       ],
+      "Last configuration status": [
+        ""
+      ],
+      "Never": [
+        ""
+      ],
+      "No configuration status available": [
+        ""
+      ],
+      "Failed": [
+        ""
+      ],
+      "Changed": [
+        ""
+      ],
+      "Scheduled": [
+        ""
+      ],
+      "Failed to start": [
+        ""
+      ],
+      "Restarted": [
+        ""
+      ],
+      "Corrective Change": [
+        ""
+      ],
+      "Skipped": [
+        ""
+      ],
+      "Out of sync": [
+        ""
+      ],
+      "Puppet metrics": [
+        ""
+      ],
       "Puppet details": [
         ""
       ],

data/app/assets/javascripts/foreman_puppet/locale/zh_CN/foreman_puppet.js

@@ -809,6 +809,42 @@
       "Error!": [
         "错误！"
       ],
+      "Last configuration status": [
+        ""
+      ],
+      "Never": [
+        ""
+      ],
+      "No configuration status available": [
+        ""
+      ],
+      "Failed": [
+        ""
+      ],
+      "Changed": [
+        ""
+      ],
+      "Scheduled": [
+        ""
+      ],
+      "Failed to start": [
+        ""
+      ],
+      "Restarted": [
+        ""
+      ],
+      "Corrective Change": [
+        ""
+      ],
+      "Skipped": [
+        ""
+      ],
+      "Out of sync": [
+        ""
+      ],
+      "Puppet metrics": [
+        ""
+      ],
       "Puppet details": [
         "Puppet 详情"
       ],

data/app/assets/javascripts/foreman_puppet/locale/zh_TW/foreman_puppet.js

@@ -811,6 +811,42 @@
       "Error!": [
         ""
       ],
+      "Last configuration status": [
+        ""
+      ],
+      "Never": [
+        ""
+      ],
+      "No configuration status available": [
+        ""
+      ],
+      "Failed": [
+        ""
+      ],
+      "Changed": [
+        ""
+      ],
+      "Scheduled": [
+        ""
+      ],
+      "Failed to start": [
+        ""
+      ],
+      "Restarted": [
+        ""
+      ],
+      "Corrective Change": [
+        ""
+      ],
+      "Skipped": [
+        ""
+      ],
+      "Out of sync": [
+        ""
+      ],
+      "Puppet metrics": [
+        ""
+      ],
       "Puppet details": [
         ""
       ],

data/app/controllers/concerns/foreman_puppet/extensions/api_v2_registration_controller_extensions.rb

@@ -0,0 +1,21 @@
+module ForemanPuppet
+  module Extensions
+    module ApiV2RegistrationControllerExtensions
+      extend ActiveSupport::Concern
+
+      def host_setup_extension
+        if @host.hostgroup.present?
+          @host.puppet_proxy_id = @host.hostgroup.puppet_proxy_id if @host.puppet_proxy_id.nil? && @host.hostgroup.puppet_proxy_id.present?
+          @host.puppet_ca_proxy_id = @host.hostgroup.puppet_ca_proxy_id if @host.puppet_ca_proxy_id.nil? && @host.hostgroup.puppet_ca_proxy_id.present?
+
+          if @host.puppet.nil? && @host.hostgroup.puppet&.environment.present?
+            puppet = @host.puppet || @host.build_puppet
+            puppet.environment = @host.hostgroup.puppet&.environment
+          end
+        end
+
+        super
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_puppet/extensions/host_common.rb

@@ -9,8 +9,7 @@ module ForemanPuppet
       end
 
       def puppetclasses
-        return ForemanPuppet::Puppetclass.none unless puppet
-        puppet.puppetclasses
+        (puppet || build_puppet).puppetclasses
       end
     end
   end

data/app/views/foreman_puppet/puppetclasses/index.html.erb

@@ -29,7 +29,7 @@
                   main_app.hash_for_edit_hostgroup_path(id: hg).merge(auth_object: hg, authorizer: @hostgroups_authorizer)
               end.to_sentence.html_safe %>
         </td>
-        <td><%= link_to puppetclass.hosts_count, main_app.hosts_path(search: "class = #{puppetclass.name}")%></td>
+        <td><%= link_to puppetclass.hosts_count, main_app.hosts_path(search: "puppetclass = #{puppetclass.name}")%></td>
         <td><%= puppetclass.class_params.size %> </td>
         <td>
           <%

data/lib/foreman_puppet/engine.rb

@@ -54,6 +54,7 @@ module ForemanPuppet
 
       ::Api::V2::BaseController.include ForemanPuppet::Extensions::ApiBaseController
       ::Api::V2::HostsController.include ForemanPuppet::Extensions::ApiV2HostsController
+      ::Api::V2::RegistrationController.prepend ForemanPuppet::Extensions::ApiV2RegistrationControllerExtensions
       ::Api::V2::HostgroupsController.include ForemanPuppet::Extensions::ApiHostgroupsController
       ::Api::V2::TemplateCombinationsController.include ForemanPuppet::Extensions::ApiTemplateCombinationsController
       ::Api::V2::HostsController.include ForemanPuppet::Extensions::ParametersHost

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '6.2.0'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/locale/ca/foreman_puppet.po

@@ -109,6 +109,9 @@ msgstr "Canvia l'entorn"
 msgid "Change Puppet Master"
 msgstr ""
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr ""
 
@@ -148,6 +151,9 @@ msgstr "Gestió de la configuració"
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -262,12 +268,18 @@ msgstr ""
 msgid "Facts"
 msgstr "Objectes d'interès"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr ""
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr "No s'ha pogut establir el servidor intermediari %{proxy_type} per a %{host}."
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr ""
 
@@ -409,6 +421,9 @@ msgstr "Classes heretades de %s"
 msgid "Invalid proxy selected!"
 msgstr "El servidor intermediari seleccionat no és vàlid!"
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "Llista tots els ID de les classes de Puppet per a l'amfitrió"
 
@@ -484,12 +499,18 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "Nou"
 
 msgid "No changes to your environments detected"
 msgstr ""
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "No hi ha cap entorn seleccionat!"
 
@@ -553,6 +574,9 @@ msgstr "Organitzacions"
 msgid "Original value info"
 msgstr ""
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -637,6 +661,9 @@ msgstr ""
 msgid "Puppet interval"
 msgstr "Interval de Puppet"
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Paràmetre de Puppet"
 
@@ -673,6 +700,12 @@ msgstr "Informes"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr ""
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "Selecciona l'entorn"
 
@@ -709,6 +742,9 @@ msgstr ""
 msgid "Show template combination"
 msgstr "Mostra una combinació de plantilles"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "Paràmetre de la classe intel·ligent"
 

data/locale/cs_CZ/foreman_puppet.po

@@ -114,6 +114,9 @@ msgstr "Změnit prostředí"
 msgid "Change Puppet Master"
 msgstr ""
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "Změněná prostředí"
 
@@ -153,6 +156,9 @@ msgstr "Správa nastavení"
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -267,12 +273,18 @@ msgstr ""
 msgid "Facts"
 msgstr "Fakta"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "Nepodařilo se importovat %{klass} pro %{name}: neexistuje v databázi – bude ignorováno"
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr ""
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr ""
 
@@ -414,6 +426,9 @@ msgstr ""
 msgid "Invalid proxy selected!"
 msgstr ""
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "Vypsat všechny identifikátory Puppet tříd pro hostitele"
 
@@ -489,12 +504,18 @@ msgstr ""
 msgid "Name"
 msgstr "Název"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "Nové"
 
 msgid "No changes to your environments detected"
 msgstr "Nezjištěny žádné změny ve vašich prostředích"
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "Nevybráno prostředí!"
 
@@ -558,6 +579,9 @@ msgstr "Organizace"
 msgid "Original value info"
 msgstr "Informace o původní hodnotě"
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -642,6 +666,9 @@ msgstr ""
 msgid "Puppet interval"
 msgstr ""
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Puppet parametr"
 
@@ -678,6 +705,12 @@ msgstr "Výkazy"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr ""
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "Vybrat prostředí"
 
@@ -714,6 +747,9 @@ msgstr ""
 msgid "Show template combination"
 msgstr "Zobrazit kombinaci šablony"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr ""
 

data/locale/de/foreman_puppet.po

@@ -130,6 +130,9 @@ msgstr "Umgebung ändern"
 msgid "Change Puppet Master"
 msgstr "Puppet-Master ändern"
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "Geänderte Umgebungen"
 
@@ -169,6 +172,9 @@ msgstr "Konfigurationsmanagement"
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -283,12 +289,18 @@ msgstr "Fehler!"
 msgid "Facts"
 msgstr "Fakten"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "Fehler beim Importieren der Klasse %{class} for %{name}: existiert nicht in der Datenbank - wird ignoriert"
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr "Einstellung von %{proxy_type} Proxy für %{host} fehlgeschlagen."
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr "Fehler beim Aktualisieren von Umgebungen und Puppet-Klassen von der lokalen Puppet Installation: %s"
 
@@ -430,6 +442,9 @@ msgstr "Vererbte Klassen von %s"
 msgid "Invalid proxy selected!"
 msgstr "Ungültiger Proxy ausgewählt!"
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "Alle Puppet-Klassen-Kennungen für den Host auflisten"
 
@@ -505,12 +520,18 @@ msgstr "Alle übereinstimmenden Werte (nur vom Typ Array/Hash) zusammenführen"
 msgid "Name"
 msgstr "Name"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "Neu"
 
 msgid "No changes to your environments detected"
 msgstr "Keine Änderungen an Ihren Umgebungen entdeckt"
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "Es wurde keine Umgebung ausgewählt!"
 
@@ -574,6 +595,9 @@ msgstr "Organisationen"
 msgid "Original value info"
 msgstr "Information zum Originalwert"
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr "Überschreiben"
 
@@ -658,6 +682,9 @@ msgstr "YAML-Ausgabe des externen Puppet-Knotens"
 msgid "Puppet interval"
 msgstr "Puppet-Intervall"
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Puppet-Parameter"
 
@@ -694,6 +721,12 @@ msgstr "Berichte"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr "Erforderlicher Parameter ohne Wert.<br/><b>Bitte überschreiben!</b><br/>"
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "Umgebung auswählen"
 
@@ -730,6 +763,9 @@ msgstr "Überschreibungswert für einen bestimmten Smart-Klassenparameter anzeig
 msgid "Show template combination"
 msgstr "Vorlagenkombination anzeigen"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "Smart-Class-Parameter"
 

data/locale/en/foreman_puppet.po

@@ -105,6 +105,9 @@ msgstr ""
 msgid "Change Puppet Master"
 msgstr ""
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr ""
 
@@ -144,6 +147,9 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -258,12 +264,18 @@ msgstr ""
 msgid "Facts"
 msgstr ""
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr ""
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr ""
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr ""
 
@@ -405,6 +417,9 @@ msgstr ""
 msgid "Invalid proxy selected!"
 msgstr ""
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr ""
 
@@ -480,12 +495,18 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr ""
 
 msgid "No changes to your environments detected"
 msgstr ""
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr ""
 
@@ -549,6 +570,9 @@ msgstr ""
 msgid "Original value info"
 msgstr ""
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -633,6 +657,9 @@ msgstr ""
 msgid "Puppet interval"
 msgstr ""
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr ""
 
@@ -669,6 +696,12 @@ msgstr ""
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr ""
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr ""
 
@@ -705,6 +738,9 @@ msgstr ""
 msgid "Show template combination"
 msgstr ""
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr ""