foreman_discovery 25.0.1 → 25.1.1

data/app/assets/javascripts/foreman_discovery/locale/pt_BR/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.0.0",
+        "Project-Id-Version": "foreman_discovery 25.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Valeria S Silva <valeriassilva@live.com>, 2015",
@@ -374,9 +374,6 @@
       "IP Address": [
         "Endereço IP"
       ],
-      "IP address": [
-        "Endereco de IP"
-      ],
       "IPAM must be configured for subnet '%s'": [
         "O IPAM deve ser configurado para a sub-rede '%s'"
       ],
@@ -386,6 +383,12 @@
       "IPMI facts": [
         "Fatos IPMI"
       ],
+      "IPv4": [
+        "IPv4"
+      ],
+      "IPv6": [
+        "IPv6"
+      ],
       "Identifier": [
         "Identificador"
       ],
@@ -797,6 +800,9 @@
       "not required if using a subnet with DHCP proxy": [
         "não necessário se utilizar um subrede com proxy DHCP"
       ],
+      "not required if using an IPv6 subnet with DHCP proxy": [
+        ""
+      ],
       "number of entries per request": [
         "número de entradas por requisições"
       ],
@@ -821,6 +827,9 @@
       "required if host is managed and value is not inherited from host group": [
         "necessário se o host é gerenciado e valor não é herdado do grupo de host"
       ],
+      "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
+        ""
+      ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         "solicitado se o provisionamento não for baseado em imagem, o host for gerenciado e o valor não for herdado do grupo de host"
       ],

data/app/assets/javascripts/foreman_discovery/locale/ru/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.0.0",
+        "Project-Id-Version": "foreman_discovery 25.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Yulia <yulia.poyarkova@redhat.com>, 2016",
@@ -375,9 +375,6 @@
       "IP Address": [
         "IP"
       ],
-      "IP address": [
-        "IP-адрес"
-      ],
       "IPAM must be configured for subnet '%s'": [
         ""
       ],
@@ -387,6 +384,12 @@
       "IPMI facts": [
         ""
       ],
+      "IPv4": [
+        "IPv4"
+      ],
+      "IPv6": [
+        "IPv6"
+      ],
       "Identifier": [
         "Идентификатор"
       ],
@@ -798,6 +801,9 @@
       "not required if using a subnet with DHCP proxy": [
         "не требуется, если используется подсеть с DHCP прокси"
       ],
+      "not required if using an IPv6 subnet with DHCP proxy": [
+        ""
+      ],
       "number of entries per request": [
         "количество записей на запрос"
       ],
@@ -822,6 +828,9 @@
       "required if host is managed and value is not inherited from host group": [
         "требуется, если узел уже контролируется, но значение не было унаследовано от группы узлов"
       ],
+      "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
+        ""
+      ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         "требуется, если подготовка управляемого узла осуществляется без участия образов и при этом значение не было унаследовано от группы узлов"
       ],

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.0.0",
+        "Project-Id-Version": "foreman_discovery 25.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "johnny.westerlund <johnny.westerlund@gmail.com>, 2014",
@@ -371,9 +371,6 @@
       "IP Address": [
         "IPadress"
       ],
-      "IP address": [
-        ""
-      ],
       "IPAM must be configured for subnet '%s'": [
         ""
       ],
@@ -383,6 +380,12 @@
       "IPMI facts": [
         ""
       ],
+      "IPv4": [
+        ""
+      ],
+      "IPv6": [
+        ""
+      ],
       "Identifier": [
         ""
       ],
@@ -794,6 +797,9 @@
       "not required if using a subnet with DHCP proxy": [
         ""
       ],
+      "not required if using an IPv6 subnet with DHCP proxy": [
+        ""
+      ],
       "number of entries per request": [
         "antal poster per begäran"
       ],
@@ -818,6 +824,9 @@
       "required if host is managed and value is not inherited from host group": [
         ""
       ],
+      "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
+        ""
+      ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         ""
       ],

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

@@ -3,10 +3,10 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.0.0",
+        "Project-Id-Version": "foreman_discovery 25.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
-        "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
+        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
         "Language-Team": "Chinese (China) (http://app.transifex.com/foreman/foreman/language/zh_CN/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -39,7 +39,7 @@
         "指定机构"
       ],
       "Associated Hosts": [
-        "关联主机"
+        "关联的主机"
       ],
       "Auto Provision": [
         "自动置备"
@@ -159,7 +159,7 @@
         "现在正在重启发现主机"
       ],
       "Discovered hosts from Foreman server at %{foreman_url}": [
-        "来自 %%{foreman_url} Foreman 服务器的发现主机"
+        "来自 %{foreman_url} Foreman 服务器的发现主机"
       ],
       "Discovered hosts reported from unknown subnet are %s, communication will not be proxied.": [
         "从未知子网报告发现的主机为 %s，通信数据将不会被代理。"
@@ -276,7 +276,7 @@
         "重启主机 %s 失败"
       ],
       "Failed to reboot host %{hostname} with error %{error_message}": [
-        "重启主机 %%{hostname} 失败，错误为 %%{error_message}"
+        "重启主机 %{hostname} 失败，错误为 %{error_message}"
       ],
       "Failed to reboot hosts with error %s": [
         "无法重启主机，错误 %s"
@@ -285,7 +285,7 @@
         "%s 的事实刷新失败"
       ],
       "Failed to refresh facts for %{hostname} with error %{error_message}": [
-        "为 %%{hostname} 刷新事实失败，错误为 %%{error_message}"
+        "为 %{hostname} 刷新事实失败，错误为 %{error_message}"
       ],
       "For more information please see ": [
         "查看详情 "
@@ -368,9 +368,6 @@
       "IP Address": [
         "IP 地址"
       ],
-      "IP address": [
-        "IP 地址"
-      ],
       "IPAM must be configured for subnet '%s'": [
         "必须为子网 '%s' 配置 IPAM"
       ],
@@ -380,6 +377,12 @@
       "IPMI facts": [
         "IPMI 详情"
       ],
+      "IPv4": [
+        "IPv4的"
+      ],
+      "IPv6": [
+        "IPv6的"
+      ],
       "Identifier": [
         "鉴定"
       ],
@@ -791,6 +794,9 @@
       "not required if using a subnet with DHCP proxy": [
         "如果使用带有 DHCP 代理的子网则不需要"
       ],
+      "not required if using an IPv6 subnet with DHCP proxy": [
+        "如果使用带有 DHCP 代理的 IPv6 子网，则不需要"
+      ],
       "number of entries per request": [
         "每个请求的条目数"
       ],
@@ -815,6 +821,9 @@
       "required if host is managed and value is not inherited from host group": [
         "如果主机是受管的，且值没有从主机组继承，则是必需的"
       ],
+      "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
+        "如果主机被管理，没有 IPv4 IP / Subnet，或值不是从主机组继承的，则不需要"
+      ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         "如果不是基于置备镜像的，主机是受管的，且值没有从主机组继承，则是必需的"
       ],

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.0.0",
+        "Project-Id-Version": "foreman_discovery 25.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -371,9 +371,6 @@
       "IP Address": [
         "IP 位址"
       ],
-      "IP address": [
-        "IP 位址"
-      ],
       "IPAM must be configured for subnet '%s'": [
         ""
       ],
@@ -383,6 +380,12 @@
       "IPMI facts": [
         ""
       ],
+      "IPv4": [
+        "IPv4"
+      ],
+      "IPv6": [
+        "IPv6"
+      ],
       "Identifier": [
         "辨識碼"
       ],
@@ -794,6 +797,9 @@
       "not required if using a subnet with DHCP proxy": [
         "若是使用一個含有 DHCP 協定的子網路則不需要"
       ],
+      "not required if using an IPv6 subnet with DHCP proxy": [
+        ""
+      ],
       "number of entries per request": [
         "每個請求的項目數量"
       ],
@@ -818,6 +824,9 @@
       "required if host is managed and value is not inherited from host group": [
         "若主機是個受管理的主機，並且值不是由主機群組所繼承的話便需要"
       ],
+      "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group": [
+        ""
+      ],
       "required if not imaged based provisioning and host is managed and value is not inherited from host group": [
         "若不是基於映像檔的佈建，而主機受管理並且值並非由主機群組所繼承的話便需要"
       ],

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -53,6 +53,7 @@ module Api
         param :name, String
         param :environment_id, String, :desc => N_("required if host is managed and value is not inherited from host group")
         param :ip, String, :desc => N_("not required if using a subnet with DHCP proxy")
+        param :ip6, String, :desc => N_("not required if using an IPv6 subnet with DHCP proxy")
         param :mac, String, :desc => N_("not required if it's a virtual machine")
         param :architecture_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
         param :domain_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
@@ -62,6 +63,7 @@ module Api
         param :medium_id, String, :desc => N_("required if not imaged based provisioning and host is managed and value is not inherited from host group")
         param :ptable_id, :number, :desc => N_("required if host is managed and custom partition has not been defined")
         param :subnet_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
+        param :subnet6_id, :number, :desc => N_("required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group")
         param :sp_subnet_id, :number
         param :model_id, :number
         param :hostgroup_id, :number

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,43 +1,49 @@
-module Foreman::Controller::Parameters::DiscoveredHost
-  extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::Host
-  if defined?(ForemanPuppet)
-    include ForemanPuppet::Extensions::ParametersHost
-  end
+module Foreman
+  module Controller
+    module Parameters
+      module DiscoveredHost
+        extend ActiveSupport::Concern
+        include Foreman::Controller::Parameters::Host
+        if defined?(ForemanPuppet)
+          include ForemanPuppet::Extensions::ParametersHost
+        end
 
-  class_methods do
-    def discovered_host_params_filter
-      Foreman::ParameterFilter.new(::Host::Discovered).tap do |filter|
-        filter.permit :discovery_rule_id
+        class_methods do
+          def discovered_host_params_filter
+            Foreman::ParameterFilter.new(::Host::Discovered).tap do |filter|
+              filter.permit :discovery_rule_id
 
-        add_host_base_params_filter(filter)
-        add_host_common_params_filter(filter)
-        add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
-      end
-    end
-  end
+              add_host_base_params_filter(filter)
+              add_host_common_params_filter(filter)
+              add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
+            end
+          end
+        end
 
-  def discovered_host_params
-    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def discovered_host_params
+          filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def discovered_host_params_host
-    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def discovered_host_params_host
+          filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def managed_host_params_host
-    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def managed_host_params_host
+          filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def managed_host_params
-    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
+        def managed_host_params
+          filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
+      end
+    end
   end
 end

data/app/controllers/concerns/foreman/controller/parameters/discovery_rule.rb

@@ -1,17 +1,23 @@
-module Foreman::Controller::Parameters::DiscoveryRule
-  extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::Taxonomix
+module Foreman
+  module Controller
+    module Parameters
+      module DiscoveryRule
+        extend ActiveSupport::Concern
+        include Foreman::Controller::Parameters::Taxonomix
 
-  class_methods do
-    def discovery_rule_params_filter
-      Foreman::ParameterFilter.new(::DiscoveryRule).tap do |filter|
-        filter.permit :name, :search, :hostname, :priority, :enabled, :hostgroup, :hostgroup_id, :max_count
-        add_taxonomix_params_filter(filter)
+        class_methods do
+          def discovery_rule_params_filter
+            Foreman::ParameterFilter.new(::DiscoveryRule).tap do |filter|
+              filter.permit :name, :search, :hostname, :priority, :enabled, :hostgroup, :hostgroup_id, :max_count
+              add_taxonomix_params_filter(filter)
+            end
+          end
+        end
+
+        def discovery_rule_params
+          self.class.discovery_rule_params_filter.filter_params(params, parameter_filter_context)
+        end
       end
     end
   end
-
-  def discovery_rule_params
-    self.class.discovery_rule_params_filter.filter_params(params, parameter_filter_context)
-  end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -335,19 +335,6 @@ class DiscoveredHostsController < ::ApplicationController
     Bullet.enable = true if defined? Bullet
   end
 
-  def get_interfaces
-    @host.interfaces.each do |interface|
-      @interfaces << {:identifier => interface["identifier"], :type => interface["type"], :mac => interface["mac"], :ip => interface["ip"]? interface["ip"] : "N/A", :primary => interface["primary"], :provision => interface["provision"]}
-    end
-  end
-
-  def add_custom_facts
-    unless @host.primary_interface.subnet.nil?
-      discovery_subnet = "#{@host.primary_interface.subnet.name} (#{@host.primary_interface.subnet.network})"
-      assign_fact_to_category("discovery_subnet", discovery_subnet)
-    end
-  end
-
   def process_warning(hash = {})
     warning hash[:warning_msg]
   end

data/app/models/host/discovered.rb

@@ -18,6 +18,7 @@ class Host::Discovered < ::Host::Base
   scoped_search :on => :created_at, :default_order => :desc, :only_explicit => true
   scoped_search :on => :last_report, :complete_value => true, :only_explicit => true
   scoped_search :relation => :primary_interface, :on => :ip, :complete_value => true
+  scoped_search :relation => :primary_interface, :on => :ip6, :complete_value => true
   scoped_search :relation => :primary_interface, :on => :mac, :complete_value => true
   scoped_search :relation => :model, :on => :name, :complete_value => true, :rename => :model, :only_explicit => true
   scoped_search :relation => :fact_values, :on => :value, :in_key => :fact_names, :on_key => :name, :rename => :facts, :complete_value => true, :only_explicit => true

data/app/services/foreman_discovery/fact_to_category_resolver.rb

@@ -33,7 +33,8 @@ module ForemanDiscovery
           identifier: interface["identifier"],
           type: interface["type"],
           mac: interface["mac"],
-          ip: interface["ip"] || "N/A",
+          ip: interface["ip"],
+          ip6: interface["ip6"],
           primary: interface["primary"],
           provision: interface["provision"],
         }
@@ -50,10 +51,7 @@ module ForemanDiscovery
         assign_fact_to_category(key, value)
       end
 
-      return if host.primary_interface.subnet.nil?
-
-      discovery_subnet = "#{host.primary_interface.subnet.name} (#{host.primary_interface.subnet.network})"
-      assign_fact_to_category("discovery_subnet", discovery_subnet)
+      subnets_facts(host.primary_interface)
     end
 
     def assign_fact_to_category(key, value)
@@ -74,6 +72,14 @@ module ForemanDiscovery
       end
     end
 
+    def subnets_facts(iface)
+      subnet4 = iface.subnet
+      subnet6 = iface.subnet6
+
+      assign_fact_to_category("discovery_subnet", "#{subnet4.name} (#{subnet4.network})") if subnet4
+      assign_fact_to_category("discovery_subnet6", "#{subnet6.name} (#{subnet6.network})") if subnet6
+    end
+
     def highlights
       /^(productname|memorysize|manufacturer|architecture|macaddress$|processorcount|physicalprocessorcount|discovery_subnet|discovery_boot|ipaddress$)/
     end
@@ -103,4 +109,3 @@ module ForemanDiscovery
     end
   end
 end
-

data/app/services/foreman_discovery/lldp_neighbors.rb

@@ -52,15 +52,18 @@ module ForemanDiscovery
 
       return if neighbors.nil?
 
-      ip  = primary.ip
+      ip = primary.ip
+      ip6 = primary.ip6
       mac = primary.mac
       name = primary.name
+
       primary.update(
           :primary   => false,
           :provision => false,
           :managed   => false,
           :name      => nil,
-          :ip        => nil
+          :ip        => nil,
+          :ip6       => nil
       )
 
       bond = Nic::Bond.create(
@@ -70,6 +73,7 @@ module ForemanDiscovery
           :provision        => true,
           :name             => name,
           :ip               => ip,
+          :ip6              => ip6,
           :mac              => mac,
           :host             => host
       )

data/app/views/api/v2/discovered_hosts/main.json.rabl

@@ -2,7 +2,8 @@ object @discovered_host
 
 extends "api/v2/discovered_hosts/base"
 
-attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
+attributes :ip, :ip6, :mac, :last_report, :subnet_id,
+  :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
 attribute :cpu_count => :cpus
 
 node :subnet_name do |host|

data/app/views/discovered_hosts/_discovered_host.html.erb

@@ -1,6 +1,7 @@
 <td class="ellipsis"><%= link_to (discovery_status_icon(host) + '&nbsp;'.html_safe + trunc_with_tooltip(h(host.name))), discovered_host_path(host) %></td>
 <td class="hidden-tablet hidden-xs"><%= host.try(:hardware_model_name) || 'N/A' %></td>
 <td class="hidden-tablet hidden-xs"><%= host.ip %></td>
+<td class="hidden-tablet hidden-xs"><%= host.ip6 %></td>
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :cpu_count) %></td>
 <td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %></td>
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :disk_count) %></td>

data/app/views/discovered_hosts/_discovered_hosts_list.html.erb

@@ -5,7 +5,8 @@
       <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
       <th class=''><%= sort :name, :as => _('Name') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
-      <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IPv4') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :ip6, :as => _('IPv6') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :cpu_count, :as => _('CPUs') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>

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

@@ -44,7 +44,8 @@
               <th class="hidden-xs " width="12%"><%= _('Type') %></th>
               <th class="hidden-xs "><%= _('Identifier') %></th>
               <th class="hidden-xs "><%= _("MAC address") %></th>
-              <th class="hidden-xs "><%= _("IP address") %></th>
+              <th class="hidden-xs "><%= _("IPv4") %></th>
+              <th class="hidden-xs "><%= _("IPv6") %></th>
             </tr>
             <% @interfaces.each do |interface| %>
               <tr>
@@ -52,6 +53,7 @@
                 <td class="ellipsis"><%= interface[:identifier] %></td>
                 <td class="ellipsis"><%= interface[:mac] %></td>
                 <td class="ellipsis"><%= interface[:ip] %></td>
+                <td class="ellipsis"><%= interface[:ip6] %></td>
               </tr>
             <% end %>
           </table>

data/app/views/discovered_mailer/_discovered_host.html.erb

@@ -3,7 +3,12 @@
   <%= link_to host, discovered_host_url(:id => host, :host => @url.host, :port => @url.port, :only_path => false, :protocol => @url.scheme) %>
 </td>
 <td style="<%= td_style%>"><%= host.try(:hardware_model_name) || 'N/A' %></td>
+<% if host.ip %>
 <td style="<%= td_style%>"><%= host.ip %></td>
+<% end %>
+<% if host.ip6 %>
+<td style="<%= td_style%>"><%= host.ip6 %></td>
+<% end %>
 <td style="<%= td_style%>"><%= discovery_attribute(host, :cpu_count) %></td>
 <td style="<%= td_style%>"><%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %></td>
 <td style="<%= td_style%>"><%= discovery_attribute(host, :disk_count) %></td>

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "25.0.1"
+  VERSION = "25.1.1"
 end

data/locale/ca/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 25.0.0\n"
+"Project-Id-Version: foreman_discovery 25.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"
@@ -376,9 +376,6 @@ msgstr ""
 msgid "IP Address"
 msgstr "Adreça IP"
 
-msgid "IP address"
-msgstr "Adreça IP"
-
 msgid "IPAM must be configured for subnet '%s'"
 msgstr ""
 
@@ -388,6 +385,12 @@ msgstr ""
 msgid "IPMI facts"
 msgstr ""
 
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
 msgid "Identifier"
 msgstr "Identificador"
 
@@ -799,6 +802,9 @@ msgstr ""
 msgid "not required if using a subnet with DHCP proxy"
 msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari DHCP"
 
+msgid "not required if using an IPv6 subnet with DHCP proxy"
+msgstr ""
+
 msgid "number of entries per request"
 msgstr "Nombre d'entrades per petició"
 
@@ -823,6 +829,9 @@ msgstr "es requereix si l'amfitrió està gestionat i no s'ha definit la partici
 msgid "required if host is managed and value is not inherited from host group"
 msgstr ""
 
+msgid "required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group"
+msgstr ""
+
 msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
 msgstr ""