foreman_discovery 1.1.1 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 321fccd57e6e597e9d144fbdfed50b2ebf31060a
-  data.tar.gz: d51274ca2f006f8c2ceb300a1cb7690c80eb4aeb
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2Q3YTViNGViOWY1MjE4NTQ3MzE2NDE2MGExYTQyYmNlOGIzMWY0YQ==
+  data.tar.gz: !binary |-
+    YmM5OTJjNDAwNmZhNTcyZTRhMzkwYjlhY2FkNzY3ZGFiNzUzYjc1ZA==
 SHA512:
-  metadata.gz: 397579ca7a041155026bfdd6d1bd4ff189319e4f980c41a9ae706dc1e7c1444eefbc70c05eeed8bf3ea812dbf394d0206850f5a91303636b5e10f064003b174b
-  data.tar.gz: bcb39a17222301d169f9b06ec1dadf281bfe528683370d64ae2abe5fc7260fa4f6268ce1ade4641b9f26edab3323edf55e3279fff3a085297df84661418c586b
+  metadata.gz: !binary |-
+    MWZjMGJjYTNkMjYyZTY3YzhjMGQ1ZTAzYTg3YjIxMTQ2ZmI3NmY4MmIzMTgx
+    MGVlOGM5MjY3YzViZDZiZTFkYzVhZDMyNzNiMmI2MjYyOTk3NDdlMDVmM2U4
+    MDBkYWRlYWE3OGZkNzIxMWYzZWZjOTBhZjUxOWJhNzY4YjBkOGM=
+  data.tar.gz: !binary |-
+    ZjNmOTFkMzk3ZWQwNzIxODRjZGYwNjQyMjM5ODE4YTdkNGRhMDgxYjgyZWYw
+    MjU5YTFlYzE1NTk3ODg1OTk3YjY0Y2U5MWVjNGE2ZjVkMDEyNzYzYmEyNWE4
+    MzNjYTNlMTI0ODg5NDExYTJmY2MzODI5MDdkMWJlZWQ3OTgxODY=

data/README.md

@@ -4,15 +4,21 @@ This plugin enables MaaS hardware discovery in Foreman.
 
 ## Installation
 
-See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
-for how to install Foreman plugins
+Please see the Foreman wiki for appropriate instructions:
+
+* [Foreman: How to Install a Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
+
+The gem name is "foreman_discovery".
+
+RPM users can install the "ruby193-rubygem-foreman_discovery" or
+"rubygem-foreman_discovery" packages.
 
 ## Compatibility
 
-| Foreman Version | Plugin Version |
-| --------------- | --------------:|
-| <= 1.2          | 1.0.2          |
-| >= 1.3          | 1.1.0          |
+| Foreman Version | Plugin Version | oVirt Image Version |
+| --------------- | --------------:| -------------------:|
+| <= 1.2          | 1.0.2          | N/A                 |
+| >= 1.3          | 1.1.0          | 0.1.0               |
 
 ## Latest code
 
@@ -20,77 +26,18 @@ You can get the develop branch of the plugin by specifying your Gemfile in this
 
     gem 'foreman_discovery', :git => "https://github.com/theforeman/foreman_discovery.git"
 
-# Building the Discovery PXE Image
+# Building or downloading an image
 
-There is a rake task for the discovery image. It requires Ruby 1.8, but should
-appropriately detect and use ruby1.8 even if the system default is 1.9. If you
-have trouble building it, try a ruby1.8-only system.
+There are two options at the moment:
 
-Run this rake task to create the image:
+* [Build or download Tiny Core Linux based image](README.tcl_image.md)
+* [Build or download oVirt Node based image](README.ovirt_image.md)
 
-    foreman-rake discovery:build_image
-
-You image will be in ./discovery\_image. Run the rake task as root, or with passwordless
-sudo, as the password prompts may get lost in the ruby->bash forking process.
+The TCL image has the same version as the Foreman Discovery plugin, the oVirt
+Node image has different versioning scheme.
 
 # Configuration
 
-## Image configuration
-
-The PXE image has two configuration options during build:
-
-* By default it will have an automatic login to the 'tc' user and start ssh so you can
-ssh to `tc@<ip>` with password test1234. By specifying `mode=prod` on the rake task,
-you can disable both of these - the image will have no accounts that can be logged in
-* If you need to add additional files to the image, put them in `./additional_build_files/` -
-these will be copied to `/additional_build_files/` in the image
-
-Also, it will attempt todownload `/discovery_init.sh` from your Foreman server and run
-it. This is entirely optional - if the server cannot be reached or the file cannot be
-found, the image has a fallback script built in.
-
-You can find an example script [here](extra/discovery_init.sh.example) - place your
-modified version in the `public/` directory on your Foreman server.
-
-## PXE config
-
-Configure the PXE default to boot the Discovery Image built above, eg:
-
-    DEFAULT menu
-    PROMPT 0
-    MENU TITLE PXE Menu
-    TIMEOUT 200
-    TOTALTIMEOUT 6000
-    ONTIMEOUT discovery
-
-    LABEL discovery
-    MENU LABEL Boot Discovery
-    TEXT HELP
-    Boot the Foreman Discovery Image
-    Use TAB to edit options for specific needs.
-    ENDTEXT
-    KERNEL /boot/TinyCore-vmlinuz
-    APPEND initrd=/boot/TinyCore-initrd.gz foreman.ip=192.168.122.1:3000
-
-Be sure to alter the foreman.ip appropriately. You can also use foreman.server to
-specify a DNS record (`foreman.server=myforemanhost`) but in this case the port will
-be assumed to be http (80). If all else fails (say, USB boot where we can't provide
-options) it will look for a DNS record of `foreman`
-
-### Known Issues with the image
-
-On some multi-core systems the TinyCore kernel may segfault on boot with an error message similar to :
-
-    "Fixing recursive fault but reboot is needed!"
-
-If this happens, it can be fixed by changing the KERNEL line in the PXE config above to read :
-
-    KERNEL /boot/TinyCore-vmlinuz maxcpus=1
-
-More information on the maxcpus kernel parameter can be found at <https://www.kernel.org/doc/Documentation/kernel-parameters.txt>
-
-A currently unavoidable side effect of this setting is that the initial facts gathered during discovery will only show a single processor, since that is all that is visible to the kernel.
-
 ## UI config
 
 No configuration of the Foreman UI is required. If you are using Locations and/or Organisations,
@@ -128,6 +75,7 @@ assign the `:perform_discovery` permission to an existing Role.
 
 # TODO
 
+* Support for downloading shell script for oVirt Node image
 * Add more Tests
 * Add API
 * Add proper Location/Organization handling (via a Wizard maybe?)

data/Rakefile

@@ -6,11 +6,15 @@ require 'fileutils'
 
 task :default => :test
 
+PLUGIN_NAME = "discovery"
 ENGINE_DIR = File.expand_path('..', __FILE__)
-FOREMAN_DIR = 'test/foreman_app'
+FOREMAN_DIR = '.foreman_app'
 
-namespace :test do
-  desc "Download latest foreman devel source and install dependencies"
+ENV['TEXTDOMAIN'] = PLUGIN_NAME
+import "#{FOREMAN_DIR}/Rakefile" if File.exists? "#{FOREMAN_DIR}/Rakefile"
+
+namespace :setup do
+  desc "Download latest foreman core devel source and install dependencies"
   task :foreman_prepare do
     foreman_repo = 'https://github.com/theforeman/foreman.git'
     foreman_gemfile = File.join(FOREMAN_DIR, "Gemfile")
@@ -19,20 +23,12 @@ namespace :test do
       puts "Downloading latest Foreman development branch into #{FOREMAN_DIR}..."
       FileUtils.mkdir_p(FOREMAN_DIR)
 
-      unless system("git clone #{foreman_repo} #{FOREMAN_DIR}")
+      unless system("git clone --depth 1 #{foreman_repo} #{FOREMAN_DIR}")
         puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
         fail
       end
     end
 
-    gemfile_content = File.read(foreman_gemfile)
-    unless gemfile_content.include?('FOREMAN_GEMFILE')
-      puts 'Preparing Gemfile'
-      gemfile_content.gsub!('__FILE__', 'FOREMAN_GEMFILE')
-      gemfile_content.insert(0, "FOREMAN_GEMFILE = __FILE__ unless defined? FOREMAN_GEMFILE\n")
-      File.open(foreman_gemfile, 'w') { |f| f << gemfile_content }
-    end
-
     settings_file = "#{FOREMAN_DIR}/config/settings.yaml"
     unless File.exists?(settings_file)
       puts 'Preparing settings file'
@@ -79,7 +75,7 @@ GEMFILE
       puts <<MESSAGE
 Foreman source code not prepared. Run
 
-  rake test:foreman_prepare
+  rake setup:foreman_prepare
 
 to download foreman source and its dependencies
 MESSAGE
@@ -96,16 +92,19 @@ MESSAGE
     FileUtils.cd(pwd)
   end
 
+  task :all => [:foreman_prepare, :db_prepare]
+end
+
+namespace :test do
   task :set_loadpath do
     %w[lib test].each do |dir|
       $:.unshift(File.expand_path(dir, ENGINE_DIR))
     end
   end
 
-  task :all => [:db_prepare, :set_loadpath] do
-    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','')  unless f.include? '/foreman_app/' }
+  task :all => ['setup:db_prepare', 'test:set_loadpath'] do
+    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','') unless f.include? '.foreman_app/' }
   end
-
 end
 
 task :test => 'test:all'

data/app/controllers/discovers_controller.rb

@@ -82,9 +82,9 @@ class DiscoversController < ::ApplicationController
 
   def refresh_facts
     if @host.is_a?(::Host::Discovered) and @host.refresh_facts
-      process_success :success_msg =>  "Facts refreshed for #{@host.name}", :success_redirect => :back
+      process_success :success_msg => _("Facts refreshed for %s") % @host.name, :success_redirect => :back
     else
-      process_error :error_msg => "Failed to refresh facts for #{@host.name}", :redirect => :back
+      process_error :error_msg => _("Failed to refresh facts for %s") % @host.name, :redirect => :back
     end
   end
 
@@ -97,9 +97,9 @@ class DiscoversController < ::ApplicationController
 
     missed_hosts = @hosts.map(&:name).join('<br/>')
     if @hosts.empty?
-      notice "Destroyed selected hosts"
+      notice _("Destroyed selected hosts")
     else
-      error "The following hosts were not deleted: #{missed_hosts}"
+      error _("The following hosts were not deleted: %s") % missed_hosts
     end
     redirect_to(discovers_path)
   end
@@ -154,16 +154,16 @@ class DiscoversController < ::ApplicationController
     if params[:host_names].present? or params[:host_ids].present?
       @hosts = Host::Discovered.where("id IN (?) or name IN (?)", params[:host_ids], params[:host_names] )
       if @hosts.empty?
-        error 'No hosts were found with that id or name'
+        error _('No hosts were found with that id or name')
         redirect_to(discovers_path) and return false
       end
     else
-      error 'No Hosts selected'
+      error _('No hosts selected')
       redirect_to(discovers_path) and return false
     end
 
   rescue => e
-    error "Something went wrong while selecting hosts - #{e}"
+    error _("Something went wrong while selecting hosts - %s") % e
     redirect_to discovers_path
   end
 
@@ -177,15 +177,14 @@ class DiscoversController < ::ApplicationController
     # Check for explicit parameter override
     ip = params.delete('ip') if params.include?('ip')
 
-    Rails.logger.info ip.inspect
     # in case we got back multiple ips (see #1619)
     ip = ip.split(',').first
   end
 
   def taxonomy_scope
-    if params[:host]
-      @organization = Organization.find_by_id(params[:host][:organization_id])
-      @location = Location.find_by_id(params[:host][:location_id])
+    if @host
+      @organization = @host.organization
+      @location = @host.location
     end
 
     if SETTINGS[:organizations_enabled]

data/app/helpers/discovers_helper.rb

@@ -1,31 +1,31 @@
 module DiscoversHelper
 
   def disc_report_column(record)
-    return record.last_report? ? time_ago_in_words(record.last_report.getlocal) +" ago": ""
+    record.last_report? ? (_("%s ago") % time_ago_in_words(record.last_report.getlocal)) : ""
   end
 
   def discovers_title_actions(host)
     title_actions(
       button_group(
-        link_to("Provision", hash_for_edit_discover_path(:id => host), :class => 'btn-primary')
+        link_to(_("Provision"), hash_for_edit_discover_path(:id => host), :class => 'btn-primary')
       ),
       button_group(
-        link_to("Refresh Facts", hash_for_refresh_facts_discover_path(:id => host))
+        link_to(_("Refresh facts"), hash_for_refresh_facts_discover_path(:id => host))
       ),
       button_group(
-        link_to("Delete", hash_for_discover_path(:id => host),
-                :class => "btn btn-danger", :confirm => 'Are you sure?', :method => :delete)
+        link_to(_("Delete"), hash_for_discover_path(:id => host),
+                :class => "btn btn-danger", :confirm => _('Are you sure?'), :method => :delete)
       )
     )
   end
 
   def multiple_discovers_actions_select
-    actions = [['Delete Hosts', multiple_destroy_discovers_path, 'trash']]
-    actions <<  ['Assign Organization', select_multiple_organization_discovers_path, 'tags'] if SETTINGS[:organizations_enabled]
-    actions <<  ['Assign Location', select_multiple_location_discovers_path, 'map-marker'] if SETTINGS[:locations_enabled]
+    actions = [[_('Delete hosts'), multiple_destroy_discovers_path, 'trash']]
+    actions <<  [_('Assign Organization'), select_multiple_organization_discovers_path, 'tags'] if SETTINGS[:organizations_enabled]
+    actions <<  [_('Assign Location'), select_multiple_location_discovers_path, 'map-marker'] if SETTINGS[:locations_enabled]
 
     content_tag :span, :id => 'submit_multiple' do
-      select_action_button( _("Select Action"), actions.map do |action|
+      select_action_button( _("Select action"), actions.map do |action|
         link_to(icon_text(action[2], action[0]) , action[1], :class=>'btn',  :title => _("%s - The following hosts are about to be changed") % action[0])
       end.flatten)
     end

data/app/models/host/discovered.rb

@@ -23,16 +23,17 @@ class Host::Discovered < ::Host::Base
 
   def self.importHostAndFacts facts
     raise(::Foreman::Exception.new("Invalid Facts, must be a Hash")) unless facts.is_a?(Hash)
-    hostname   = facts["macaddress_eth0"].try(:downcase).try(:gsub,/:/,'')
-    raise(::Foreman::Exception.new("Invalid facts: hash does not contain macaddress_eth0 to use as hostname")) unless hostname
+    fact_name = Setting[:discovery_fact] || 'macaddress'
+    hostname   = facts[fact_name].try(:downcase).try(:gsub,/:/,'')
+    raise(::Foreman::Exception.new("Invalid facts: hash does not contain the required fact '#{fact_name}'")) unless hostname
 
     # filter facts
-    facts.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem|version/i }
+    facts.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem/i }
 
     h = ::Host::Discovered.find_by_name hostname
     h ||= Host.new :name => hostname, :type => "Host::Discovered"
     h.type = "Host::Discovered"
-    h.mac = facts["macaddress_eth0"].try(:downcase)
+    h.mac = facts[fact_name].try(:downcase)
 
     if SETTINGS[:locations_enabled]
       begin
@@ -77,7 +78,7 @@ class Host::Discovered < ::Host::Base
       logger.debug "retrieving facts from proxy on ip: #{self.ip}"
       facts = ForemanDiscovery::Facts.new(:url => "http://#{self.ip}:8443").facts
     rescue Exception => e
-      raise "Could not get facts from Proxy: #{e}"
+      raise _("Could not get facts from proxy: %s") % e
     end
 
     return self.class.importHostAndFacts facts

data/app/models/host/managed_extensions.rb

@@ -9,7 +9,7 @@ module Host::ManagedExtensions
   def queue_reboot
     return if new_record? # Discovered Hosts already exist, and new_records will break `find`
     return unless type_changed? and ::Host::Base.find(self.id).type == "Host::Discovered"
-    post_queue.create(:name => "Rebooting #{self}", :priority => 10000,
+    post_queue.create(:name => _("Rebooting %s") % self, :priority => 10000,
                       :action => [self, :setReboot])
   end
 
@@ -21,7 +21,7 @@ module Host::ManagedExtensions
       logger.info "ForemanDiscovery: reboot result: failed"
     end
   rescue => e
-    failure "Failed to reboot: #{proxy_error e}"
+    failure _("Failed to reboot: %s") % proxy_error(e)
   end
 
   def delReboot

data/app/models/setting/discovered.rb

@@ -6,17 +6,23 @@ class Setting::Discovered < ::Setting
     # Check the table exists
     return unless super
 
+    Setting.transaction do
+      [
+        self.set('discovery_fact', _("The default fact name to use for the MAC of the system"), "macaddress"),
+      ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
+    end
+
     if SETTINGS[:locations_enabled]
       Setting.transaction do
         [
-          self.set('discovery_location', "The default Location to place Discovered Hosts in", ""),
+          self.set('discovery_location', _("The default location to place discovered hosts in"), ""),
         ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
       end
     end
     if SETTINGS[:organizations_enabled]
       Setting.transaction do
         [
-          self.set('discovery_organization', "The default Organization to place Discovered Hosts in", "" ),
+          self.set('discovery_organization', _("The default organization to place discovered hosts in"), "" ),
         ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
       end
     end

data/app/overrides/add_dashboard_table.rb

@@ -1,11 +1,16 @@
 Deface::Override.new(:virtual_path => "dashboard/_status_table",
                      :name => "add_dashboard_table",
                      :insert_after => "ul:last",
-                   :text => '
-<h4 class="header"><%= "Host Pool" -%></h4>
+                   :text => ("
+<h4 class='header'><%= _('Host Pool') %></h4>
 <ul>
   <li>
-    <%= link_to("Unassigned Hosts", discovers_path, :class=>"dashboard-links" ) %>
+    <%= link_to(_('Unassigned hosts'), discovers_path, :class=>'dashboard-links' ) %>
     <h4><%= Host::Discovered.count %></h4>
   </li>
-</ul>')
+</ul>"))
+
+# strings used above, for the purposes of extraction only, as they're not
+# detected within the full override template string above
+N_('Host Pool')
+N_('Unassigned hosts')

data/app/views/discovers/_discovers_list.html.erb

@@ -1,18 +1,18 @@
 <%= javascript "jquery.cookie", "host_checkbox" %>
-<% title 'Discovered Hosts' %>
+<% title _('Discovered hosts') %>
 <table class="table table-bordered table-striped table-condensed" >
   <tr>
     <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
-    <th class=''><%= sort :name %></th>
-    <th class="hidden-tablet hidden-phone"><%= sort :model %></th>
+    <th class=''><%= sort :name, :as => _('Name') %></th>
+    <th class="hidden-tablet hidden-phone"><%= sort :model, :as => _('Model') %></th>
     <% if SETTINGS[:locations_enabled] -%>
-      <th class="hidden-tablet hidden-phone"><%= sort :location %></th>
+      <th class="hidden-tablet hidden-phone"><%= sort :location, :as => _('Location') %></th>
     <% end -%>
     <% if SETTINGS[:organizations_enabled] -%>
-      <th class="hidden-tablet hidden-phone"><%= sort :organization %></th>
+      <th class="hidden-tablet hidden-phone"><%= sort :organization, :as => _('Organization') %></th>
     <% end -%>
-    <th class="hidden-tablet hidden-phone"><%= sort :subnet, :as => "Subnet" %></th>
-    <th class="hidden-tablet hidden-phone"><%= sort :last_report, :as => "Facts last received" %></th>
+    <th class="hidden-tablet hidden-phone"><%= sort :subnet, :as => _("Subnet") %></th>
+    <th class="hidden-tablet hidden-phone"><%= sort :last_report, :as => _("Last facts upload") %></th>
     <th></th>
   </tr>
   <% @hosts.each do |host| -%>
@@ -32,9 +32,9 @@
       <td class="hidden-tablet hidden-phone"><%= disc_report_column(host) %></td>
       <td>
         <%= action_buttons(
-          link_to("Provision", hash_for_edit_discover_path(:id => host)),
-          link_to("Refresh Facts", hash_for_refresh_facts_discover_path(:id => host)),
-          display_delete_if_authorized(hash_for_discover_path(:id => host), :confirm => "Delete #{host.name}?", :action => :destroy))%>
+          link_to(_("Provision"), hash_for_edit_discover_path(:id => host)),
+          link_to(_("Refresh facts"), hash_for_refresh_facts_discover_path(:id => host)),
+          display_delete_if_authorized(hash_for_discover_path(:id => host), :confirm => _("Delete %s?") % host.name, :action => :destroy))%>
         </td>
       </tr>
     <% end -%>
@@ -43,14 +43,14 @@
 <div id="confirmation-modal" class="modal hide fade">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">×</a>
-    <h3>Please Confirm</h3>
+    <h3><%= _('Please Confirm') %></h3>
   </div>
   <div class="modal-body"></div>
   <div class="modal-footer">
-    <a href="#" class="btn btn-primary">Submit</a>
-    <a href="#" class="btn secondary">Cancel</a>
+    <a href="#" class="btn btn-primary"><%= _('Submit') %></a>
+    <a href="#" class="btn secondary"><%= _('Cancel') %></a>
   </div>
 </div>
 
-<%= page_entries_info @hosts, :model => 'Hosts' %>
+<%= page_entries_info @hosts %>
 <%= will_paginate @hosts %>

data/app/views/discovers/_selected_hosts.html.erb

@@ -4,10 +4,14 @@
     <table class="table table-bordered table-striped">
       <thead>
         <tr>
-          <th> Name </th>
-          <th> Model </th>
-          <%= raw("<th>Location</th>") if SETTINGS[:locations_enabled]%>
-          <%= raw("<th>Organization</th>") if SETTINGS[:organizations_enabled]%>
+          <th><%= _('Name') %></th>
+          <th><%= _('Model') %></th>
+          <% if SETTINGS[:locations_enabled] %>
+            <th><%= _('Location') %></th>
+          <% end %>
+          <% if SETTINGS[:organizations_enabled] %>
+            <th><%= _('Organization') %></th>
+          <% end %>
         </tr>
       </thead>
       <tbody>

data/app/views/discovers/multiple_destroy.html.erb

@@ -1,5 +1,6 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 
 <%= form_tag submit_multiple_destroy_hosts_path(:host_ids => params[:host_ids]), :onsubmit => "resetSelection()" do -%>
-  <span class="label label-warning">Warning</span> This might take a while, as all hosts, facts and reports will be destroyed as well
+  <span class="label label-warning"><%= _('Warning') -%></span>
+  <%= _('This might take a while, as all hosts, facts and reports will be destroyed as well') %>
 <% end %>

data/app/views/discovers/select_multiple_location.html.erb

@@ -2,9 +2,9 @@
 <div class="row">
   <div class="span8">
     <%= form_for :location, :url => update_multiple_location_hosts_path(:host_ids => params[:host_ids]) do |f| %>
-      <%= f.select :id, Location.all.map{|e| [e.name, e.id]},{:include_blank => "Select Location"},
+      <%= f.select :id, Location.all.map{|e| [e.name, e.id]},{:include_blank => _("Select location")},
                    :onchange => "toggle_multiple_ok_button(this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>
     <% end %>
   </div>
-</div>
+</div>

data/app/views/discovers/select_multiple_organization.html.erb

@@ -2,9 +2,9 @@
 <div class="row">
   <div class="span8">
     <%= form_for :organization, :url => update_multiple_organization_hosts_path(:host_ids => params[:host_ids]) do |f| %>
-      <%= f.select :id, Organization.all.map{|e| [e.name, e.id]},{:include_blank => "Select Organization"},
+      <%= f.select :id, Organization.all.map{|e| [e.name, e.id]},{:include_blank => _("Select organization")},
                    :onchange => "toggle_multiple_ok_button(this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -1,12 +1,12 @@
-<% title "Discovered Host: #{@host.to_label}" %>
+<% title(_("Discovered host: %s") % @host.to_label) %>
 
 <%= discovers_title_actions(@host) %>
 
-<h3> Facts Discovered on this Host </h3>
+<h3><%= _('Facts discovered on this host') -%></h3>
 <table class="table table-bordered table-striped table-condensed">
   <tr>
-    <th>Fact</th>
-    <th>Value</th>
+    <th><%= _('Fact') -%></th>
+    <th><%= _('Value') -%></th>
   <% @host.facts_hash.sort.each do |fact| -%>
     <tr>
       <td><%= fact[0] %></td>

data/config/initializers/discovery_setup.rb

@@ -1,18 +1 @@
-# Add permissions
-Foreman::AccessControl.map do |map|
-  map.security_block :discovery do |map|
-    map.permission :perform_discovery, {:discovers => [:index, :show, :update, :new,
-      :edit, :destroy, :create, :auto_complete_search, :select_multiple_organization,
-      :update_multiple_organization, :select_multiple_location, :refresh_facts,
-      :update_multiple_location, :submit_multiple_destroy, :multiple_destroy]}
-  end
-end
 
-begin
-  # Add a new role called 'Discovery' if it doesn't exist
-  Role.transaction do
-    role = Role.find_or_create_by_name("Discovery")
-    role.update_attribute :permissions, [:perform_discovery] if role.permissions.empty?
-  end
-rescue
-end