foreman_discovery 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNmNzE1ODY2NjM0ZWZmMmI0MzljNDI5NzkxZDllZDAxOTI5NzE3Zg==
+    YjgxMDAyZjVkZWJkMjE2NDRmMDMwODUwNjI0YTQ1ZDA2NjgwNGRhMg==
   data.tar.gz: !binary |-
-    MDk2NTBhMjNhYWU5NWI0ZDhhMzRlYWU1NDVmMjdhN2RiMDI5ZjVmOQ==
+    MDk1NDMyNDJhM2Q0MDk5ZjY3ODgwNzc4ZjE0MzVkODJiODI2YjdlMA==
 SHA512:
   metadata.gz: !binary |-
-    ZjA4NTZmNjczZjBiODExN2Q1ZDcyYjA1ODg5NmJjZjY4NDlkYWUyYzUwY2I4
-    ZTU2Yzc5ZGQzNWY3MzBlNGI5ZmU3ODY1ZThmZTI1MDg4YThmZDgzY2E1MTgy
-    ODc2ZmVhZjhkOWQxMDAzYzc2YjQ4NzllNGE5NzFkYzgzNzQ3YmI=
+    MzYyNzIyMGQxMWM1ZjM5MTMxMWI0ZDk3N2FkNjQ2YzI5MzBiNjgyZGJmYTRm
+    NTQ2MDg0M2FjODQzNDA5N2Y1ZGIyNmE1YmIwN2I4MDY2NzVkZTEwNWZjZmYx
+    N2NlYzZlOWYxODBlYTQ5YjA3NDZmZGU4MDBkYzJmMDE0OTBiZGY=
   data.tar.gz: !binary |-
-    MDMyNGQwYmJlYmZlODU0YWRjNzlkYjQ1YzFhMjE0ZTY4MDI0YjkxYWM1NmY0
-    OTRiMmM2NmJmNTYyY2M5MjA2ZjMyMDhiOTFkY2E0MDRiN2UwYzhmNjM5ZmIw
-    ZTA4NTQ4ZjE2ZTg3NWVlODU1Y2Q3NjRhNDZkNGNlYzE2YjcxMWI=
+    NDBkMTU2Y2YwMmU2MzBiNGE1ZmY5Zjc0ZmM1MDhkYzg3YWU4NTVmNzYwNGQz
+    YjlkNjBjNDQ2NDE5YmQ0ZTBjYThhMTg5MTBmYTU5MmJlMDYzYmNkMTdjZmU4
+    NTM2ODliOTFjZjVmNzQ0ODliMWNlYTdmNjM0ODA4MmUxYmZiY2Y=

data/app/lib/puppet_fact_parser_extensions.rb

@@ -0,0 +1,31 @@
+module PuppetFactParserExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :primary_interface, :discovery_fact
+    alias_method_chain :ip, :discovery_fact
+  end
+
+  # we prefer discovery_bootif fact to choose right primary interface (interface used to boot the image)
+  def primary_interface_with_discovery_fact
+    mac = facts[discovery_mac_fact_name]
+    interfaces.each do |int, values|
+      return int.to_s if (values[:macaddress] == mac)
+    end
+    primary_interface_without_discovery_fact # fallback if we didn't find interface with such macaddress
+  end
+
+  # search for IP of interface with primary interface macaddress (ipaddress fact does not have to be interface used for boot)
+  def ip_with_discovery_fact
+    facts[:interfaces].split(',').each do |interface|
+      return facts["ipaddress_#{interface}"] if facts["macaddress_#{interface}"] == facts[discovery_mac_fact_name]
+    end
+    ip_without_discovery_fact # fallback if IP was not found
+  end
+
+  private
+
+  def discovery_mac_fact_name
+    Setting[:discovery_fact] || 'macaddress'
+  end
+end

data/app/models/host/discovered.rb

@@ -75,7 +75,7 @@ class Host::Discovered < ::Host::Base
     super + [:ip]
   end
 
-  def populate_fields_from_facts facts = self.facts_hash, type = 'puppet'
+  def populate_fields_from_facts facts = self.facts_hash
     importer = super
     self.subnet = Subnet.subnet_for(importer.ip)
     self.save

data/lib/foreman_discovery/engine.rb

@@ -75,6 +75,7 @@ module ForemanDiscovery
     config.to_prepare do
       # Include host extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
+      ::PuppetFactParser.send :include, PuppetFactParserExtensions
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.4.0.rc1"
+  VERSION = "1.4.0.rc2"
 end

data/locale/de/foreman_discovery.po

@@ -5,14 +5,15 @@
 # 
 # Translators:
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.3.0\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 10:19+0100\n"
-"PO-Revision-Date: 2014-08-08 09:41+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"POT-Creation-Date: 2014-08-20 08:33+0100\n"
+"PO-Revision-Date: 2014-09-16 16:47+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,12 +60,18 @@ msgstr "Hosts löschen"
 msgid "Destroyed selected hosts"
 msgstr "Ausgewählte Hosts gelöscht"
 
+msgid "Discovered Host Pool"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Entdeckter Host: %s"
 
 msgid "Discovered hosts"
 msgstr "Entdeckte Hosts"
 
+msgid "Discovery widget"
+msgstr ""
+
 msgid "Fact"
 msgstr "Fakt"
 
@@ -86,15 +93,15 @@ msgstr "Neustart fehlgeschlagen: %s"
 msgid "Failed to refresh facts for %s"
 msgstr "Fakten für %s konnten nicht erneuert werden"
 
-msgid "Host Pool"
-msgstr "Host-Pool"
-
 msgid "Imported Host::Discovered"
 msgstr "Host::Discovered wurde importiert"
 
 msgid "Invalid facts, must be a Hash"
 msgstr "Ungültige Fakten, es muss sich um einen Hash handeln"
 
+msgid "Invalid facts: hash does not contain IP address"
+msgstr ""
+
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr "Ungültige Fakten: Der Hash enthält den benötigten Fakt nicht: %s"
 
@@ -113,11 +120,14 @@ msgstr "Modell"
 msgid "Name"
 msgstr "Name"
 
+msgid "No discovered hosts available"
+msgstr ""
+
 msgid "No hosts selected"
 msgstr "Keine Hosts ausgewählt"
 
 msgid "No hosts were found with that id or name"
-msgstr "Es wurden keine Systeme mit dieser ID oder diesem Namen gefunden"
+msgstr "Es wurden keine Systeme mit dieser Kennung oder diesem Namen gefunden"
 
 msgid "Organization"
 msgstr "Organisation"
@@ -178,13 +188,15 @@ msgid ""
 "as well"
 msgstr "Dies kann eine Weile dauern, weil alle Systeme, Fakten und Reporte auch gelöscht werden"
 
+msgid "Total pool size"
+msgid_plural "Total pool size"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-msgid "Unassigned hosts"
-msgstr "Nicht zugeordnete Hosts"
-
 msgid "Upload facts for a host, creating the host if required"
 msgstr ""
 
@@ -216,4 +228,4 @@ msgid "paginate results"
 msgstr ""
 
 msgid "sort results"
-msgstr ""
+msgstr "Ergebnisse sortieren"

data/locale/en_GB/foreman_discovery.po

@@ -7,10 +7,10 @@
 # Dominic Cleal <dcleal@redhat.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.3.0\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 10:19+0100\n"
-"PO-Revision-Date: 2014-08-08 09:41+0000\n"
+"POT-Creation-Date: 2014-08-20 08:33+0100\n"
+"PO-Revision-Date: 2014-08-22 09:57+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -58,12 +58,18 @@ msgstr "Delete hosts"
 msgid "Destroyed selected hosts"
 msgstr "Destroyed selected hosts"
 
+msgid "Discovered Host Pool"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Discovered host: %s"
 
 msgid "Discovered hosts"
 msgstr "Discovered hosts"
 
+msgid "Discovery widget"
+msgstr ""
+
 msgid "Fact"
 msgstr "Fact"
 
@@ -85,15 +91,15 @@ msgstr "Failed to reboot: %s"
 msgid "Failed to refresh facts for %s"
 msgstr "Failed to refresh facts for %s"
 
-msgid "Host Pool"
-msgstr "Host Pool"
-
 msgid "Imported Host::Discovered"
 msgstr "Imported Host::Discovered"
 
 msgid "Invalid facts, must be a Hash"
 msgstr "Invalid facts, must be a Hash"
 
+msgid "Invalid facts: hash does not contain IP address"
+msgstr ""
+
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr "Invalid facts: hash does not contain the required fact '%s'"
 
@@ -112,6 +118,9 @@ msgstr "Model"
 msgid "Name"
 msgstr "Name"
 
+msgid "No discovered hosts available"
+msgstr ""
+
 msgid "No hosts selected"
 msgstr "No hosts selected"
 
@@ -177,13 +186,15 @@ msgid ""
 "as well"
 msgstr "This might take a while, as all hosts, facts and reports will be destroyed as well"
 
+msgid "Total pool size"
+msgid_plural "Total pool size"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-msgid "Unassigned hosts"
-msgstr "Unassigned hosts"
-
 msgid "Upload facts for a host, creating the host if required"
 msgstr ""
 

data/locale/es/foreman_discovery.po

@@ -8,10 +8,10 @@
 # Sergio Ocón <sergio@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.3.0\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 10:19+0100\n"
-"PO-Revision-Date: 2014-08-08 12:11+0000\n"
+"POT-Creation-Date: 2014-08-20 08:33+0100\n"
+"PO-Revision-Date: 2014-08-29 11:11+0000\n"
 "Last-Translator: Sergio Ocón <sergio@redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -59,12 +59,18 @@ msgstr "Borrar Equipos"
 msgid "Destroyed selected hosts"
 msgstr "Eliminados equipos seleccionados"
 
+msgid "Discovered Host Pool"
+msgstr "Pool de hosts descubierto"
+
 msgid "Discovered host: %s"
 msgstr "Equipo descubierto: %s"
 
 msgid "Discovered hosts"
 msgstr "Equipos descubiertos"
 
+msgid "Discovery widget"
+msgstr "Widget de descubrimiento"
+
 msgid "Fact"
 msgstr "Dato"
 
@@ -86,15 +92,15 @@ msgstr "Fallo al reiniciar: %s"
 msgid "Failed to refresh facts for %s"
 msgstr "Fallo al refrescar datos para %s"
 
-msgid "Host Pool"
-msgstr "Conjunto de equipos"
-
 msgid "Imported Host::Discovered"
 msgstr "Host Importado::Descubierto"
 
 msgid "Invalid facts, must be a Hash"
 msgstr "Datos no válidos, debe ser un Hash"
 
+msgid "Invalid facts: hash does not contain IP address"
+msgstr "Detalles inválidiso: el hash no contiene una dirección IP"
+
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr "Datos no válidos: el hash debe contener '%s'"
 
@@ -113,6 +119,9 @@ msgstr "Modelo"
 msgid "Name"
 msgstr "Nombre"
 
+msgid "No discovered hosts available"
+msgstr "No hay hosts descubiertos disponibles"
+
 msgid "No hosts selected"
 msgstr "Ningún equipo seleccionado"
 
@@ -178,13 +187,15 @@ msgid ""
 "as well"
 msgstr "Esta acción puede tardar un rato, ya que se eliminarán todos los equipos, datos e informes."
 
+msgid "Total pool size"
+msgid_plural "Total pool size"
+msgstr[0] "Tamaño total del pool"
+msgstr[1] "Tamaño total del pool"
+
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "UUID para seguir el estado de la tarea de orquestación, GET /api/orchestration/:UUID/tasks"
 
-msgid "Unassigned hosts"
-msgstr "Equipos sin asignar"
-
 msgid "Upload facts for a host, creating the host if required"
 msgstr "Subir detalles para un host, creando el host si es necesario"
 

data/locale/fr/foreman_discovery.po

@@ -8,11 +8,11 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.3.0\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 10:19+0100\n"
-"PO-Revision-Date: 2014-08-11 17:50+0000\n"
-"Last-Translator: Pierre-Emmanuel Dutang <dutangp@gmail.com>\n"
+"POT-Creation-Date: 2014-08-20 08:33+0100\n"
+"PO-Revision-Date: 2014-08-25 08:30+0000\n"
+"Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,12 +59,18 @@ msgstr "Supprimer ces Hôtes"
 msgid "Destroyed selected hosts"
 msgstr "Hôtes sélectionnés détruits"
 
+msgid "Discovered Host Pool"
+msgstr "Pool d'hôtes détecté"
+
 msgid "Discovered host: %s"
 msgstr "Hôtes détectés : %s"
 
 msgid "Discovered hosts"
 msgstr "Hôtes détectés"
 
+msgid "Discovery widget"
+msgstr "Widget de détection"
+
 msgid "Fact"
 msgstr "Fact"
 
@@ -86,15 +92,15 @@ msgstr "Erreur de redémarrage : %s"
 msgid "Failed to refresh facts for %s"
 msgstr "Échec de rafraichissement des facts pour %s"
 
-msgid "Host Pool"
-msgstr "Regrouppement d'hôtes"
-
 msgid "Imported Host::Discovered"
 msgstr "Host::Discovered importé"
 
 msgid "Invalid facts, must be a Hash"
 msgstr "Facts invalides, doit être un hash"
 
+msgid "Invalid facts: hash does not contain IP address"
+msgstr "Facts invalides : le hash ne contient pas une adresse IP"
+
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr "Facts invalides : le hash ne doit pas contenir le fact requis '%s'"
 
@@ -113,6 +119,9 @@ msgstr "Modèle"
 msgid "Name"
 msgstr "Nom"
 
+msgid "No discovered hosts available"
+msgstr "Aucun hôte détecté disponible"
+
 msgid "No hosts selected"
 msgstr "Aucun hôte sélectionné"
 
@@ -178,13 +187,15 @@ msgid ""
 "as well"
 msgstr "Cette action peut prendre un certain temps, pour tous les hôtes, les rapports et facts vont aussi être supprimés"
 
+msgid "Total pool size"
+msgid_plural "Total pool size"
+msgstr[0] "Taille totale du pool"
+msgstr[1] "Taille totale du pool"
+
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "UUID pour surveiller l'état des tâches d'orchestration : GET /api/orchestration/:UUID/tasks"
 
-msgid "Unassigned hosts"
-msgstr "Hôtes non assignés"
-
 msgid "Upload facts for a host, creating the host if required"
 msgstr "Télécharge les facts d'un hôte, créé l'hôte si besoin"
 

data/locale/gl/foreman_discovery.po

@@ -6,10 +6,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.3.0\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 10:19+0100\n"
-"PO-Revision-Date: 2014-08-08 09:41+0000\n"
+"POT-Creation-Date: 2014-08-20 08:33+0100\n"
+"PO-Revision-Date: 2014-08-22 09:57+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/foreman/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -57,12 +57,18 @@ msgstr ""
 msgid "Destroyed selected hosts"
 msgstr "Eliminados equipos seleccionados"
 
+msgid "Discovered Host Pool"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr ""
 
 msgid "Discovered hosts"
 msgstr ""
 
+msgid "Discovery widget"
+msgstr ""
+
 msgid "Fact"
 msgstr ""
 
@@ -84,15 +90,15 @@ msgstr ""
 msgid "Failed to refresh facts for %s"
 msgstr ""
 
-msgid "Host Pool"
-msgstr ""
-
 msgid "Imported Host::Discovered"
 msgstr ""
 
 msgid "Invalid facts, must be a Hash"
 msgstr ""
 
+msgid "Invalid facts: hash does not contain IP address"
+msgstr ""
+
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr ""
 
@@ -111,6 +117,9 @@ msgstr "Modelo"
 msgid "Name"
 msgstr "Nome"
 
+msgid "No discovered hosts available"
+msgstr ""
+
 msgid "No hosts selected"
 msgstr "Ningún equipo seleccionado"
 
@@ -176,13 +185,15 @@ msgid ""
 "as well"
 msgstr "Esta acción pode tardar un anaco, xa que se eliminarán tódolos equipos, datos e informes."
 
+msgid "Total pool size"
+msgid_plural "Total pool size"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-msgid "Unassigned hosts"
-msgstr ""
-
 msgid "Upload facts for a host, creating the host if required"
 msgstr ""