foreman_discovery 5.0.2 → 6.0.0

data/app/services/foreman_discovery/host_converter.rb

@@ -2,6 +2,7 @@ class ForemanDiscovery::HostConverter
 
   # Converts discovered host to managed host without uptading the database.
   # Record must be saved explicitly (using save! or update_attributes! or similar).
+  # Creates shallow copy.
   def self.to_managed(original_host, set_managed = true, set_build = true)
     host = original_host.becomes(::Host::Managed)
     host.type = 'Host::Managed'
@@ -11,18 +12,26 @@ class ForemanDiscovery::HostConverter
       host.primary_interface.managed = set_managed
     end
     # set build only and only on final save (facts are deleted)
-    if set_build
-      # set legacy_api flag for post_queue actions
-      host.legacy_api = self.legacy_host(host)
-      # do not delete all facts (keep discovery ones)
-      host.define_singleton_method(:clearFacts) do
-        keep_ids = FactValue.where("host_id = #{host.id}").joins(:fact_name).where("fact_names.name like 'discovery_%'").pluck("fact_values.id")
-        FactValue.where("host_id = #{host.id} and id not in (?)", keep_ids).delete_all
+    set_build_clean_facts(host) if set_build
+    host
+  end
+
+  def self.set_build_clean_facts(host)
+    # set legacy_api flag for post_queue actions
+    host.legacy_api = self.legacy_host(host)
+    # fact cleaning
+    if Setting['discovery_clean_facts']
+      # clean all facts except those starting with "discovery_"
+      host.define_singleton_method(:clear_facts) do
+          keep_ids = FactValue.where("host_id = #{host.id}").joins(:fact_name).where("fact_names.name like 'discovery_%'").pluck("fact_values.id")
+          FactValue.where("host_id = #{host.id} and id not in (?)", keep_ids).delete_all
       end
-      # set build flag (also deletes facts)
-      host.build = set_build
+    else
+      # clean no facts (default behavior)
+      host.define_singleton_method(:clear_facts) {}
     end
-    host
+    # set build flag
+    host.build = true
   end
 
   def self.legacy_host(host)

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

@@ -2,7 +2,7 @@ object @discovered_host
 
 extends "api/v2/discovered_hosts/base"
 
-attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :model_name, :memory, :disk_count, :disks_size
+attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
 attribute :cpu_count => :cpus
 
 if SETTINGS[:organizations_enabled]

data/app/views/dashboard/_discovery_widget_host.html.erb

@@ -1,4 +1,4 @@
 <td><%= discovery_status_icon(host) %>&#8239;<%= link_to trunc_with_tooltip(h(host.name)), discovered_host_path(host) %></td>
-<td class="hidden-tablet hidden-xs"><%= model_name host %></td>
+<td class="hidden-tablet hidden-xs"><%= host.try(:hardware_model_name) || 'N/A' %></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>

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

@@ -1,5 +1,5 @@
 <td><%= discovery_status_icon(host) %>&#8239;<%= link_to trunc_with_tooltip(h(host.name)), discovered_host_path(host) %></td>
-<td class="hidden-tablet hidden-xs"><%= model_name 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"><%= discovery_attribute(host, :cpu_count) %></td>
 <td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %></td>

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

@@ -38,8 +38,39 @@
       <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet) %></td>
       <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
+        <!-- Modal -->
+      <div class="modal" id="<%= "fixedPropertiesSelector-#{host.id}" %>" tabindex="-1" role="dialog" aria-labelledby="fixedPropertiesSelectorLabel">
+        <div class="modal-dialog" role="document">
+          <div class="modal-content">
+            <%= form_for host, :url => edit_discovered_host_path(host), :method => :get do |f| %>
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="fixedPropertiesSelectorLabel"><%= _('Select initial host properties') %></h4>
+              </div>
+              <div class="modal-body">
+                  <%= select_f f, :hostgroup_id, accessible_hostgroups, :id, :to_label,
+                    { :include_blank => true },
+                    { :help_inline => :indicator, :size => 'col-md-10' } %>
+
+                  <% if show_organization_tab?  %>
+                    <%= select_f f, :organization_id, Organization.my_organizations, :id, :to_label, {}, {:size => 'col-md-10'} %>
+                  <% end %>
+
+                  <% if show_location_tab? %>
+                    <%= select_f f, :location_id, Location.my_locations, :id, :to_label, {}, {:size => 'col-md-10'} %>
+                  <% end %>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <input type="submit" class="btn btn-default" value="<%= _('Quick create') %>" name="quick_submit"></input>
+                <input type="submit" class="btn btn-primary" value="<%= _('Create host') %>"></input>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
         <%= action_buttons(
-          display_link_if_authorized(_("Provision"), hash_for_edit_discovered_host_path(:id => host)),
+          provision_button(host, hash_for_edit_discovered_host_path(:id => host)),
           display_link_if_authorized(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),
           display_link_if_authorized(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
           display_link_if_authorized(_("Reboot"), hash_for_reboot_discovered_host_path(:id => host), :method => :put),

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

@@ -1,4 +1,4 @@
 <% title_actions multiple_discovered_hosts_actions_select -%>
-<% title_actions display_link_if_authorized(_("Reboot All"), hash_for_reboot_all_discovered_hosts_path, {:method => :put, :disabled => @hosts.empty?}) %>
-<% title_actions display_link_if_authorized(_("Auto Provision All"), hash_for_auto_provision_all_discovered_hosts_path, {:method => :post, :disabled => @hosts.empty?}) %>
+<% title_actions display_link_if_authorized(_("Reboot All"), hash_for_reboot_all_discovered_hosts_path, {:class => 'btn btn-default', :method => :put, :disabled => @hosts.empty?}) %>
+<% title_actions display_link_if_authorized(_("Auto Provision All"), hash_for_auto_provision_all_discovered_hosts_path, {:class => 'btn btn-default', :method => :post, :disabled => @hosts.empty?}) %>
 <%= render 'discovered_hosts_list' %>

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

@@ -4,12 +4,12 @@
 
 <div class="row">
   <div class="col-md-6">
-    <div class="panel panel-default">
+    <div id="category-highlights" class="panel panel-default">
       <div class="panel-heading" ><strong> <%= _(@categories_names[0]) %></strong> </div>
         <table class="table table-bordered table-condensed table-fixed">
-        <% @categories[0].sort.each do |keys, val| %>
-            <tr class="">
-              <th class="ellipsis" width="40%"> <strong> <%= keys %> </strong></th>
+        <% @categories[0].sort.each do |key, val| %>
+            <tr id="fact-<%= key.try(:downcase) %>" class="">
+              <th class="ellipsis" width="40%"> <strong> <%= key %> </strong></th>
               <td><%= val %></td>
             </tr>
         <% end -%>
@@ -51,7 +51,7 @@
     <div class="col-md-6">
       <% @categories.each_with_index do |val, index| %>
         <% next if index == 0 || val.empty? %>
-        <div class="panel panel-default">
+        <div id="category-<%= @categories_names[index].downcase %>" class="panel panel-default">
           <div class="panel-heading" role="tab">
             <h4 class="panel-title">
               <a role="button" class="expendable-link" data-toggle="collapse" data-parent="#accordion" href="#<%= @categories_names[index].to_s + "panel" %>" aria-expanded="true" onclick="$(this).find(':first-child').toggleClass('glyphicon glyphicon-minus-sign glyphicon glyphicon-plus-sign')">

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

@@ -2,7 +2,7 @@
 <td style="<%= td_style%>">
   <%= link_to host, discovered_host_path(:id => host, :host => @url.host, :port => @url.port, :only_path => false, :protocol => @url.scheme) %>
 </td>
-<td style="<%= td_style%>"><%= host.model_name %></td>
+<td style="<%= td_style%>"><%= host.try(:hardware_model_name) || 'N/A' %></td>
 <td style="<%= td_style%>"><%= host.ip %></td>
 <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>

data/app/views/discovered_mailer/discovered_summary.text.erb

@@ -7,7 +7,7 @@
 
   <% @discovered_hosts.each do |host| %>
     <%= _('Name') %>: <%= host.to_label %>
-    <%= _('Model') %>: <%= host.model_name %>
+    <%= _('Model') %>: <%= host.try(:hardware_model_name) || 'N/A' %>
     <%= _('IP Address') %>: <%= host.ip %>
     <%= _('CPUs') %>: <%= discovery_attribute(host, :cpu_count) %>
     <%= _('Memory') %>: <%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %>
@@ -21,4 +21,4 @@
   <%= _('No new discovered hosts for this period') %>
 <% end %>
 
-<%= discovered_hosts_path(:host => @url.host, :port => @url.port, :only_path => false, :protocol => @url.scheme, :search => @query) %>
+<%= discovered_hosts_url(:host => @url.host, :port => @url.port, :only_path => false, :protocol => @url.scheme, :search => @query) %>

data/app/views/discovery_rules/_form.html.erb

@@ -22,25 +22,8 @@
                          { :help_inline => _('Target host group for this rule with all properties set') } %>
             <%= text_f f, :hostname, :help_inline => popover(
                                 _("Template"),
-                                "<div>" +
-                                        _("Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB).") +
-                                        "</div>"+
-                                        "<div>" +
-                                        _("Domain will be appended automatically. A hostname based on MAC address will be used when left blank. In addition to @host attribute function rand for random integers is available. Examples:") +
-                                        "</div>"+
-                                        "<pre>"+
-                                        "myhost-&lt;%= rand(99999) %&gt;" + "\n\n" +
-                                        "abc-&lt;%= @host.facts['bios_vendor'] + " + "\n" +
-                                        " '-' + rand(99999) %&gt;" + "\n\n" +
-                                        "xyz-&lt;%= @host.hostgroup.name %&gt;" + "\n\n" +
-                                        "srv-&lt;%= @host.discovery_rule.name %&gt;" + "\n\n" +
-                                        "server-&lt;%= @host.ip.gsub('.','-') + " + "\n" +
-                                        " '-' + @host.hostgroup.subnet.name %&gt;" + "\n" +
-                                        "</pre>"+
-                                        "</div>"+
-                                        "<div>"+
-                                        _("When creating hostname patterns, make sure the resulting host names are unique. Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID).") +
-                                        "</div>", :title => _("Hostname for provisioned hosts")).html_safe %>
+                                render('discovery_rules/template_inline'),
+                                :title => _("Hostname for provisioned hosts"), :'data-placement' => 'bottom').html_safe %>
             <%= text_f f, :max_count, :label => _('Hosts limit'), :help_inline => _('Maximum hosts provisioned with this rule (0 = unlimited)') %>
             <%= text_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)') %>
             <%= checkbox_f f, :enabled %>

data/app/views/discovery_rules/_template_inline.erb

@@ -0,0 +1,10 @@
+<div>
+<%= _("Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB).") %>
+</div><div>
+<%= _("Domain will be appended automatically. A hostname based on MAC address will be used when left blank.")  %><br/>
+<%= _("In addition to @host attribute function rand for random integers is available. Examples:") %><br/>
+<code>@host.facts['bios_vendor'], @host.discovery_rule.name</code> or <code>rand(9999)</code>.
+</div><div>
+<%= _("When creating hostname patterns, make sure the resulting host names are unique.") %><br/>
+<%= _("Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID).") %>
+</div>

data/app/views/discovery_rules/index.html.erb

@@ -1,5 +1,5 @@
 <% title _("Discovery Rules") %>
-<% title_actions display_link_if_authorized(_("New Rule"), hash_for_new_discovery_rule_path), help_path %>
+<% title_actions new_link(_("New Rule")), help_path %>
 
 <table class="table table-bordered table-striped table-two-pane">
   <tr>

data/app/views/foreman_discovery/debian_kexec.erb

@@ -0,0 +1,34 @@
+<%#
+kind: kexec
+name: Debian kexec
+oses:
+- Debian
+- Ubuntu
+-%>
+<%#
+This template is used to pass command line options to kexec when reloading
+kernel on a discovered host instead of rebooting. This is useful in PXE-less
+environments. The template must generate JSON format with three items:
+"kernel", "initram" and "append". Read kexec(8) man page for more
+information about semantics.
+-%>
+<%
+  @kernel, @initrd = @host.operatingsystem.boot_files_uri(@host.medium, @host.architecture)
+  mac = @host.facts['discovery_bootif']
+  bootif = '00-' + mac.gsub(':', '-') rescue ''
+  ip_cidr = @host.facts['discovery_ip_cidr']
+  ip = @host.facts['discovery_ip']
+  mask = @host.facts['discovery_netmask']
+  gw = @host.facts['discovery_gateway']
+  dns = @host.facts['discovery_dns']
+  append = @host.facts['append']
+  options = ["auto=true"]
+  options << "domain=#{@host.domain}"
+  options << 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us localechooser/translation/warn-light=true localechooser/translation/warn-severe=true'
+  options << "locale=#{@host.params['lang'] || 'en_US'}"
+-%>
+{
+  "kernel": "<%= @kernel %>",
+  "initram": "<%= @initrd %>",
+  "append": "url=<%= foreman_url('provision') + "&static=yes" %> interface=<%= mac %> netcfg/get_ipaddress=<%= ip %> netcfg/get_netmask=<%= mask %> netcfg/get_gateway=<%= gw %> netcfg/get_nameservers=<%= dns %> netcfg/disable_dhcp=true netcfg/get_hostname=<%= @host.name %> BOOTIF=<%= bootif %> <%= options.join(' ') %>"
+}

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -6,10 +6,10 @@ oses:
 - CentOS 5
 - CentOS 6
 - CentOS 7
-- Fedora 19
-- Fedora 20
 - Fedora 21
 - Fedora 22
+- Fedora 23
+- Fedora 24
 - RedHat 4
 - RedHat 5
 - RedHat 6
@@ -23,6 +23,7 @@ environments. The template must generate JSON format with three items:
 information about semantics.
 -%>
 <%
+  @kernel, @initrd = @host.operatingsystem.boot_files_uri(@host.medium, @host.architecture)
   mac = @host.facts['discovery_bootif']
   bootif = '00-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
@@ -37,8 +38,8 @@ information about semantics.
   "initram": "<%= @initrd %>",
 <% if (@host.operatingsystem.name == 'Fedora' and @host.operatingsystem.major.to_i > 16) or
     (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} #{append}" %>"
+  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset #{append}" %>"
 <% else -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} #{append}" %>"
+  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset #{append}" %>"
 <% end -%>
 }

data/config/routes.rb

@@ -48,6 +48,10 @@ Rails.application.routes.draw do
           post 'auto_provision_all'
           put  'reboot_all'
         end
+
+        constraints(:discovered_host_id => /[^\/]+/) do
+          resources :facts, :only => :index, :controller => :fact_values
+        end
       end
       resources :discovery_rules, :except => [:new, :edit]
     end

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -1,6 +1,20 @@
+class FakeDiscoveredHost < ActiveRecord::Base
+  self.table_name = 'hosts'
+end
+
 class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration
   def up
-    Host::Discovered.all.each { |host| host.populate_fields_from_facts}
+    FakeDiscoveredHost.where(:type => "Host::Discovered").all.each do |host|
+      begin
+        say "Populating attribute set for discovered host #{host.name}"
+        host.discovery_attribute_set = DiscoveryAttributeSet.where(:host_id => host.id).first_or_create
+        host.discovery_attribute_set.update_attributes(host.import_from_facts)
+        host.save!
+      rescue Exception => e
+        say "Error while populating host #{host.name}, deleting: #{e.message}:\n" + e.backtrace.join("\n")
+        host.destroy
+      end
+    end
   end
 
   def down

data/db/migrate/20160719124942_add_missing_view_permissions.rb

@@ -0,0 +1,18 @@
+class AddMissingViewPermissions < ActiveRecord::Migration
+  def up
+    permissions = [
+      "view_architectures", "view_domains", "view_environments", "view_hosts",
+      "view_hostgroups", "view_media", "view_models", "view_operatingsystems",
+      "view_provisioning_templates", "view_ptables", "view_puppetclasses",
+      "view_realms", "view_smart_proxies", "view_subnets"
+    ]
+    role = Role.find_by_name("Discovery Reader")
+    role.add_permissions!(permissions) if role
+    role = Role.find_by_name("Discovery Manager")
+    role.add_permissions!(permissions + ["create_hosts"]) if role
+  end
+
+  def down
+    # not implemented
+  end
+end

data/db/seeds.d/50_discovery_templates.rb

@@ -1,17 +1,19 @@
 kind = TemplateKind.where(:name => 'kexec').first_or_create
 
 ProvisioningTemplate.without_auditing do
-  content = File.read(File.join(ForemanDiscovery::Engine.root, 'app', 'views', 'foreman_discovery', 'redhat_kexec.erb'))
-  tmpl = ProvisioningTemplate.where(:name => 'Discovery Red Hat kexec').first_or_create(
-    :template_kind_id => kind.id,
-    :snippet => false,
-    :template => content
-  )
-  tmpl.attributes = {
-    :template => content,
-    :default  => true,
-    :vendor   => "Foreman Discovery",
-    :locked   => false
-  }
-  tmpl.save!(:validate => false) if tmpl.changes.present?
+  [['redhat_kexec.erb', 'Red Hat'], ['debian_kexec.erb', 'Debian']].each do |tmpl_names|
+    content = File.read(File.join(ForemanDiscovery::Engine.root, 'app', 'views', 'foreman_discovery', tmpl_names[0]))
+    tmpl = ProvisioningTemplate.where(:name => "Discovery #{tmpl_names[1]} kexec").first_or_create(
+      :template_kind_id => kind.id,
+      :snippet => false,
+      :template => content
+    )
+    tmpl.attributes = {
+      :template => content,
+      :default  => true,
+      :vendor   => "Foreman Discovery",
+      :locked   => false
+    }
+    tmpl.save!(:validate => false) if tmpl.changes.present?
+  end
 end

data/lib/discovery.rake

@@ -6,6 +6,7 @@ namespace :test do
     t.libs << ["test",test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
+    t.warning = false
   end
 end
 Rake::Task[:test].enhance do

data/lib/foreman_discovery/engine.rb

@@ -26,10 +26,6 @@ module ForemanDiscovery
       end
     end
 
-    initializer 'foreman_discovery.helper' do |app|
-      ActionView::Base.send :include, DiscoveredHostsHelper
-    end
-
     initializer 'foreman_discovery.register_gettext', :after => :load_config_initializers do |app|
       locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
       locale_domain = 'foreman_discovery'
@@ -46,7 +42,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.11.0'
+        requires_foreman '>= 1.12.0'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -114,8 +110,23 @@ module ForemanDiscovery
         ]
         MANAGER = READER + [
           # core permissions
+          :create_hosts,
+          :build_hosts,
           :assign_organizations,
           :assign_locations,
+          :view_architectures,
+          :view_domains,
+          :view_environments,
+          :view_hostgroups,
+          :view_media,
+          :view_models,
+          :view_operatingsystems,
+          :view_provisioning_templates,
+          :view_ptables,
+          :view_puppetclasses,
+          :view_realms,
+          :view_smart_proxies,
+          :view_subnets,
           # discovered_hosts
           :submit_discovered_hosts,
           :provision_discovered_hosts,
@@ -166,17 +177,20 @@ module ForemanDiscovery
       # Fact parsing
       ::FactParser.register_fact_parser(:foreman_discovery, ForemanDiscovery::FactParser)
 
+      # Taxonomy extensions
+      ::Location.send :include, DiscoveryTaxonomyExtensions
+      ::Organization.send :include, DiscoveryTaxonomyExtensions
+
       # Model extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
       ::Hostgroup.send :include, HostgroupExtensions
+      ::FactValue.send :include, FactValueExtensions
+
+      # Controller extensions
+      ::Api::V2::FactValuesController.send :include, Api::V2::FactValuesControllerExtensions
 
       # Include subnet extensions
       ::Subnet.send :include, DiscoverySubnet
-
-      # Include helper for dashboard
-      ::DashboardHelper.send(:include, DiscoveredHostsHelper)
-
-      ::SettingsHelper.send :include, ForemanDiscovery::SettingsHelperExtensions
     end
 
     rake_tasks do