foreman_discovery 1.0.0.rc2 → 1.0.0.rc3

data/README.md

@@ -35,10 +35,17 @@ sudo, as the password prompts may get lost in the ruby->bash forking process.
 
 ## Image configuration
 
-The PXE image has no configuration options during build. However, it will attempt to
-download `/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.
+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.
@@ -88,7 +95,7 @@ The uploaded hash will appear as a discovered host, and provisioning it should w
 # Usage
 
 Boot a machine using the new PXE config above. It should register with Foreman.
-The new Host should show up in `More->Discovered Hosts`. Then select a Discovered Host
+The new Host should show up in `More->Provisioning->Discovered Hosts`. Then select a Discovered Host
 and choose Provision. You'll be taken to the normal Edit page for a Host, with the
 discovered data filled in where possible. Fill in the details as normal.
 
@@ -105,10 +112,12 @@ assign the `:perform_discovery` permission to an existing Role.
 
 # TODO
 
-* Add Tests
+* Add more Tests
 * Add API
 * Add proper Location/Organization handling (via a Wizard maybe?)
 * Add per-subnet discovery
+* Rake Task for ISO build
+* Easy way to add custom facts to build/runtime
 
 # Copyright
 

data/app/controllers/discovers_controller.rb

@@ -3,35 +3,50 @@ class DiscoversController < ::ApplicationController
   include Foreman::Controller::TaxonomyMultiple
   unloadable
 
+  # Avoid auth for discovered host creation
+  skip_before_filter :require_login, :require_ssl, :authorize, :verify_authenticity_token, :set_taxonomy, :session_expiry, :update_activity_time, :only => :create
+
   before_filter :find_by_name, :only => %w[show edit update destroy refresh_facts convert]
   before_filter :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy]
 
-
   helper :hosts
 
   layout 'layouts/application'
 
   def index
     hosts = ::Host::Discovered.search_for(params[:search], :order => params[:order])
-    # This `where` shouldn't be necessary, but randomly the sql query on the line above
-    # sometimes loses the `where` clause, leading to all Hosts on the Discovery index
-    @hosts = hosts.where(:type => "Host::Discovered").includes(:model, :location, :organization).paginate :page => params[:page]
     respond_to do |format|
-      format.html { }
+      format.html { @hosts = hosts.list.paginate :page => params[:page] }
       format.json { render :json => hosts }
     end
   end
 
+  # Importing yaml is restricted to puppetmasters, so instead we take the ip
+  # as a parameter and use refresh_facts to get the rest
+  def create
+    Taxonomy.no_taxonomy_scope do
+      imported = Host::Discovered.new(:ip => get_ip_from_env).refresh_facts
+      respond_to do |format|
+        format.yml {
+          if imported
+            render :text => _("Imported facts"), :status => 200 and return
+          else
+            render :text => _("Failed to import facts"), :status => 400
+          end
+        }
+      end
+    end
+  rescue Exception => e
+    logger.warn "Failed to import facts: #{e}"
+    render :text => _("Failed to import facts: %s") % (e), :status => 400
+  end
+
   def show
-    respond_to do |format|
-      format.html {
-        # filter graph time range
-        @range = nil
+    # filter graph time range
+    @range = nil
 
-        # summary report text
-        @report_summary = nil
-      }
-    end
+    # summary report text
+    @report_summary = nil
   end
 
   def destroy
@@ -58,11 +73,52 @@ class DiscoversController < ::ApplicationController
       else
         load_vars_for_ajax
         offer_to_overwrite_conflicts
-        process_error
+        process_error :object => @host, :render => 'hosts/edit'
       end
     end
   end
 
+  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
+    else
+      process_error :error_msg => "Failed to refresh facts for #{@host.name}", :redirect => :back
+    end
+  end
+
+  def multiple_destroy
+  end
+
+  def submit_multiple_destroy
+    # keep all the ones that were not deleted for notification.
+    @hosts.delete_if {|host| host.destroy}
+
+    missed_hosts = @hosts.map(&:name).join('<br/>')
+    if @hosts.empty?
+      notice "Destroyed selected hosts"
+    else
+      error "The following hosts were not deleted: #{missed_hosts}"
+    end
+    redirect_to(discovers_path)
+  end
+
+  def auto_complete_search
+    begin
+      @items = Host::Discovered.complete_for(params[:search])
+      @items = @items.map do |item|
+        category = (['and','or','not','has'].include?(item.to_s.sub(/^.*\s+/,''))) ? 'Operators' : ''
+        part = item.to_s.sub(/^.*\b(and|or)\b/i) {|match| match.sub(/^.*\s+/,'')}
+        completed = item.to_s.chomp(part)
+        {:completed => completed, :part => part, :label => item, :category => category}
+      end
+    rescue ScopedSearch::QueryNotSupported => e
+      @items = [{:error =>e.to_s}]
+    end
+    render :json => @items
+  end
+
+  private
+
   def load_vars_for_ajax
     return unless @host
 
@@ -84,14 +140,6 @@ class DiscoversController < ::ApplicationController
     @host.overwrite = "true" if @host.errors.any? and @host.errors.are_all_conflicts?
   end
 
-  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
-    else
-      process_error :error_msg => "Failed to refresh facts for #{@host.name}", :redirect => :back
-    end
-  end
-
   def find_by_name
     params[:id].downcase! if params[:id].present?
     @host = ::Host::Discovered.find_by_id(params[:id])
@@ -117,35 +165,19 @@ class DiscoversController < ::ApplicationController
     redirect_to discovers_path
   end
 
-  def multiple_destroy
-  end
+  def get_ip_from_env
+    # try to find host based on our client ip address
+    ip = request.env['REMOTE_ADDR']
 
-  def submit_multiple_destroy
-    # keep all the ones that were not deleted for notification.
-    @hosts.delete_if {|host| host.destroy}
+    # check if someone is asking on behave of another system (load balance etc)
+    ip = request.env['HTTP_X_FORWARDED_FOR'] if request.env['HTTP_X_FORWARDED_FOR'].present?
 
-    missed_hosts = @hosts.map(&:name).join('<br/>')
-    if @hosts.empty?
-      notice "Destroyed selected hosts"
-    else
-      error "The following hosts were not deleted: #{missed_hosts}"
-    end
-    redirect_to(discovers_path)
-  end
+    # Check for explicit parameter override
+    ip = params.delete('ip') if params.include?('ip')
 
-  def auto_complete_search
-    begin
-      @items = Host::Discovered.complete_for(params[:search])
-      @items = @items.map do |item|
-        category = (['and','or','not','has'].include?(item.to_s.sub(/^.*\s+/,''))) ? 'Operators' : ''
-        part = item.to_s.sub(/^.*\b(and|or)\b/i) {|match| match.sub(/^.*\s+/,'')}
-        completed = item.to_s.chomp(part)
-        {:completed => completed, :part => part, :label => item, :category => category}
-      end
-    rescue ScopedSearch::QueryNotSupported => e
-      @items = [{:error =>e.to_s}]
-    end
-    render :json => @items
+    Rails.logger.info ip.inspect
+    # in case we got back multiple ips (see #1619)
+    ip = ip.split(',').first
   end
 
 end

data/app/helpers/discovers_helper.rb

@@ -20,16 +20,14 @@ module DiscoversHelper
   end
 
   def multiple_discovers_actions_select
-    actions = [
-      ['Delete Hosts', multiple_destroy_discovers_path, 'trash'],
-    ]
+    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', :class => 'fl' do
-      actions.map do |action|
-        link_to(icon_text(action[2]), action[1], :title => action[0])
-      end.join(' ').html_safe
+    content_tag :span, :id => 'submit_multiple' do
+      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
 
   end

data/app/models/host/discovered.rb

@@ -4,6 +4,7 @@ class Host::Discovered < ::Host::Base
 
   belongs_to :location
   belongs_to :organization
+  belongs_to :subnet
 
   scoped_search :on => :name, :complete_value => true, :default_order => true
   scoped_search :on => :last_report, :complete_value => true
@@ -11,6 +12,14 @@ class Host::Discovered < ::Host::Base
   scoped_search :on => :mac, :complete_value => true
   scoped_search :in => :model, :on => :name, :complete_value => true, :rename => :model
   scoped_search :in => :fact_values, :on => :value, :in_key => :fact_names, :on_key => :name, :rename => :facts, :complete_value => true, :only_explicit => true
+  scoped_search :in => :location, :on => :name, :rename => :location, :complete_value => true         if SETTINGS[:locations_enabled]
+  scoped_search :in => :organization, :on => :name, :rename => :organization, :complete_value => true if SETTINGS[:organizations_enabled]
+  scoped_search :in => :subnet, :on => :network, :complete_value => true, :rename => :subnet
+
+  # This `where` shouldn't be necessary, but randomly the sql query on the line above
+  # sometimes loses the `where` clause, leading to all Hosts on the Discovery index
+  # this seems like a rails bug, TODO: figure out whats really wrong here
+  scope :list, lambda { where(:type => "Host::Discovered").includes(:model, :location, :organization) }
 
   def self.importHostAndFacts data
     # data might already be a hash, from refresh_facts
@@ -30,7 +39,7 @@ class Host::Discovered < ::Host::Base
     end
 
     # filter facts
-    values.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem/i }
+    values.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem|version/i }
 
     if name
       h = ::Host::Discovered.find_by_name name
@@ -71,13 +80,14 @@ class Host::Discovered < ::Host::Base
 
   def populateFieldsFromFacts facts = self.facts_hash
     importer = super
+    self.subnet = Subnet.subnet_for(importer.ip)
     self.save
   end
 
   def refresh_facts
     # TODO: Can we rely on self.ip? The lease might expire/change....
     begin
-      logger.debug "retrieving facts from proxy"
+      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}"

data/app/models/host/managed_extensions.rb

@@ -15,7 +15,7 @@ module Host::ManagedExtensions
 
   def setReboot
     logger.info "ForemanDiscovery: Rebooting #{name} as its being discovered and assigned"
-    if ::ProxyAPI::BMC.new(:url => "http://#{ip}:8443").power :action => "cycle"
+    if ::ProxyAPI::BMC.new(:url => "http://#{old.try(:ip) || ip}:8443").power :action => "cycle"
       logger.info "ForemanDiscovery: reboot result: successful"
     else
       logger.info "ForemanDiscovery: reboot result: failed"

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

@@ -2,7 +2,7 @@
 <% title 'Discovered Hosts' %>
 <table class="table table-bordered table-striped table-condensed" >
   <tr>
-    <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :title => "Select All" } %></th>
+    <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>
     <% if SETTINGS[:locations_enabled] -%>
@@ -11,6 +11,7 @@
     <% if SETTINGS[:organizations_enabled] -%>
       <th class="hidden-tablet hidden-phone"><%= sort :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></th>
   </tr>
@@ -27,6 +28,7 @@
       <% if SETTINGS[:organizations_enabled] -%>
         <td class="hidden-tablet hidden-phone"><%= host.organization.try(:name) %></td>
       <% end -%>
+      <td class="hidden-tablet hidden-phone"><%= host.subnet %></td>
       <td class="hidden-tablet hidden-phone"><%= disc_report_column(host) %></td>
       <td>
         <%= action_buttons(

data/config/initializers/discovery_setup.rb

@@ -9,12 +9,10 @@ Foreman::AccessControl.map do |map|
 end
 
 begin
-# Add a new role called 'Discovery' if it doesn't exist
-Role.transaction do
-  discovery_role = Role.find_or_create_by_name("Discovery")
-  if discovery_role.permissions.empty?
-    discovery_role.update_attribute :permissions, [:perform_discovery]
+  # 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
-end
 rescue
 end

data/extra/build_iso.sh

@@ -3,14 +3,21 @@
 ## Remaster TCL for the Discovery Image
 # (from http://wiki.tinycorelinux.net/wiki:remastering)
 #
-# This script will build the boot image. You will need squashfs-tools and 
+# This script will build the boot image. You will need squashfs-tools and
 # advancecomp. Run it as root, or with passwordless sudo, or the password prompts
 # may get lost when the rake task is run.
 
+# Image type
+MODE=$1
+
 # Setup
 GEMS="facter json_pure rack rack-protection tilt sinatra"
-TGZS="libssl-0.9.8 ruby"
+TGZS="libssl-0.9.8 ruby firmware firmware-bnx2 firmware-broadcom scsi-3.0.21-tinycore dmidecode lldpad"
+if [[ $MODE == 'debug' ]] ; then
+  TGZS="$TGZS gcc_libs openssl-1.0.0 openssh"
+fi
 
+LAUNCH_DIR=`pwd`
 TOPDIR=`mktemp -d`
 cd $TOPDIR
 
@@ -20,6 +27,7 @@ if [ -f /tmp/tcl.iso ]; then
   cp /tmp/tcl.iso ./tcl.iso
 else
   wget http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/Core-current.iso -O tcl.iso
+  cp tcl.iso /tmp/tcl.iso
 fi
 mkdir loop && mount -oloop tcl.iso loop/
 cp loop/boot/core.gz loop/boot/vmlinuz .
@@ -28,23 +36,76 @@ umount loop && rmdir loop
 # Modify basic image:
 mkdir extract && cd extract
 zcat $TOPDIR/core.gz | sudo cpio -i -H newc -d
-mkdir opt/gems && cd opt/gems
-for n in $GEMS ; do gem fetch $n ; done
+
+# add link for dmidecode so facter can detect it.
+ln -s /usr/local/sbin/dmidecode usr/sbin/dmidecode
+
+# Include static additional files
+mkdir ./additional_build_files
+wget -O ./additional_build_files/ipmi.rb https://github.com/zoide/puppet-ipmi/raw/master/lib/facter/ipmi.rb
+wget -O ./additional_build_files/lldp.rb https://github.com/mfournier/puppet-lldp/raw/master/lib/facter/lldp.rb
+if [ -d $LAUNCH_DIR/additional_build_files ]; then
+  echo "including files from $LAUNCH_DIR/additional_build_files"
+  cp -r $LAUNCH_DIR/additional_build_files .
+fi
+
+# Account/SSH setup
+cd $TOPDIR/extract
+if [[ $MODE == "prod" ]] ; then
+  # Prod mode, lock out the accounts
+  echo "Prod mode; disabling shell"
+  cat > etc/passwd <<EOF
+root:x:0:0:root:/root:/bin/sh
+lp:x:7:7:lp:/var/spool/lpd:/bin/sh
+nobody:x:65534:65534:nobody:/nonexistent:/bin/false
+tc:x:1001:50:Linux User,,,:/home/tc:/bin/sh
+EOF
+  cat > etc/shadow <<EOF
+root:*:13525:0:99999:7:::
+lp:*:13510:0:99999:7:::
+nobody:*:13509:0:99999:7:::
+tc:*:15492:0:99999:7:::
+EOF
+  sed -i 's/-nl \/sbin\/autologin.*/38400 tty1/' etc/inittab
+else
+  echo "Debug mode; enabling SSH"
+  echo "" >> opt/bootlocal.sh
+  echo "ssh-keygen -t rsa -f /usr/local/etc/ssh/ssh_host_rsa_key -N ''" >> opt/bootlocal.sh
+  echo "ssh-keygen -t dsa -f /usr/local/etc/ssh/ssh_host_dsa_key -N ''" >> opt/bootlocal.sh
+  echo "ssh-keygen -t ecdsa -f /usr/local/etc/ssh/ssh_host_ecdsa_key -N ''" >> opt/bootlocal.sh
+  echo "cp /usr/local/etc/ssh/sshd_config.example /usr/local/etc/ssh/sshd_config" >> opt/bootlocal.sh
+  cat > etc/shadow <<EOF
+root:*:13525:0:99999:7:::
+lp:*:13510:0:99999:7:::
+nobody:*:13509:0:99999:7:::
+tc:\$1\$TdSq3t4T\$yCDutSXcI9meEywIoopbu/:15492:0:99999:7:::
+EOF
+  echo "/usr/local/sbin/sshd" >> opt/bootlocal.sh
+fi
 
 # Build the init script
-echo "" >> ../bootlocal.sh
-echo "sleep 20" >> ../bootlocal.sh # network can be slow to come up, and we're not in a rush
-echo "/opt/foreman_startup.rb" >> ../bootlocal.sh
-echo "/opt/discovery_init.sh" >> ../bootlocal.sh
+echo "" >> opt/bootlocal.sh
+echo "sleep 20" >> opt/bootlocal.sh # network can be slow to come up, and we're not in a rush
+echo "/opt/foreman_startup.rb" >> opt/bootlocal.sh
+echo "/opt/discovery_init.sh" >> opt/bootlocal.sh
 
 # Get the downloader
-wget https://raw.github.com/theforeman/foreman_discovery/master/extra/foreman_startup.rb -O ../foreman_startup.rb
-chmod 755 ../foreman_startup.rb
+cp `dirname $0`/foreman_startup.rb opt/foreman_startup.rb
+chmod 755 opt/foreman_startup.rb
+
+# Get the gems
+mkdir opt/gems && cd opt/gems
+for n in $GEMS ; do gem fetch $n ; done
 
 # Build the fallback script
 echo "#!/bin/sh" >> ../discovery_init.sh
 for n in $GEMS ; do echo "gem install -l --no-ri --no-rdoc /opt/gems/`ls *$n-[0-9]*.gem`" >> ../discovery_init.sh ; done
-echo "" >> ../bootlocal.sh
+echo "" >> ../discovery_init.sh
+echo 'FACTER_LIB=`gem which facter`' >> ../discovery_init.sh
+echo 'FACTER_PATH=`dirname $FACTER_LIB`' >> ../discovery_init.sh
+echo 'cp /additional_build_files/ipmi.rb $FACTER_PATH/facter/ipmi.rb' >> ../discovery_init.sh
+echo 'cp /additional_build_files/lldp.rb $FACTER_PATH/facter/lldp.rb' >> ../discovery_init.sh
+echo 'cp /additional_build_files/netinfo.rb $FACTER_PATH/facter/netinfo.rb' >> ../discovery_init.sh
 echo "/usr/share/foreman-proxy/bin/smart-proxy" >> ../discovery_init.sh
 echo "/usr/share/foreman-proxy/bin/discover_host" >> ../discovery_init.sh
 chmod 755 ../discovery_init.sh
@@ -87,7 +148,7 @@ mkdir -p ./proxy/usr/share
 mkdir -p ./proxy/var/run/foreman-proxy
 mkdir -p ./proxy/var/log/foreman-proxy
 git clone https://github.com/theforeman/smart-proxy.git ./proxy/usr/share/foreman-proxy
-wget https://raw.github.com/theforeman/foreman_discovery/master/extra/discover_host -O ./proxy/usr/share/foreman-proxy/bin/discover_host
+cp `dirname $0`/discover_host ./proxy/usr/share/foreman-proxy/bin/discover_host
 chmod 755 ./proxy/usr/share/foreman-proxy/bin/discover_host
 cp ./proxy/usr/share/foreman-proxy/config/settings.yml{.example,}
 sed -i 's/.*:bmc:.*/:bmc: true/' ./proxy/usr/share/foreman-proxy/config/settings.yml

data/extra/discover_host

@@ -4,11 +4,11 @@ require 'fileutils'
 require 'net/http'
 require 'net/https'
 require 'uri'
-require 'yaml'
 
-# Would like to not need this...
+# For comparison
 require 'rubygems'
-require 'json'
+require 'facter'
+require 'yaml'
 
 def discover_server
   server = (discover_by_pxe or discover_by_dns)
@@ -45,35 +45,47 @@ def discover_by_dns
   end
 end
 
+def upload
+  puts "#{Time.now}: Triggering import of facts from Foreman"
+  begin
+    uri = URI.parse(discover_server)
+    http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https' then
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    req = Net::HTTP::Post.new("/discovers")
+    req.set_form_data({})
+    response = http.request(req)
+    puts response.body
+  rescue Exception => e
+    raise "#{Time.now}: Could not send facts to Foreman: #{e}"
+  end
+end
+
+def write_cache(data)
+  File.open('/tmp/proxy_cache', 'w') {|f| f.write(data) }
+end
+
+def read_cache
+  File.read('/tmp/proxy_cache')
+rescue => e
+  "empty cache"
+end
+
 # Main
 
 $stdout.reopen("/tmp/proxy-discovery.log", "w")
 $stderr.reopen("/tmp/proxy-discovery.err", "w")
 
-# Get facts from the Proxy
-puts "retrieving facts"
-begin
-  uri = URI.parse("http://localhost:8443/facts")
-  http = Net::HTTP.new(uri.host, uri.port)
-  response = http.request(Net::HTTP::Get.new(uri.request_uri))
-  # Ugly
-  facts = YAML.dump(JSON.parse(response.body))
-rescue Exception => e
-  raise "Could not get facts from Proxy: #{e}"
-end
-
-puts "Importing facts"
-begin
-  uri = URI.parse(discover_server)
-  http = Net::HTTP.new(uri.host, uri.port)
-  if uri.scheme == 'https' then
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+# loop, but only upload on changes
+while true do
+  uninteresting_facts=/kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem|version|selinux/i
+  facts = Facter.to_hash.reject! {|k,v| k =~ uninteresting_facts }
+  unless YAML.load(read_cache) == facts
+    puts "Fact cache invalid, reloading to foreman"
+    upload
+    write_cache(YAML.dump(facts))
   end
-  req = Net::HTTP::Post.new("/fact_values/create?type=Host::Discovered")
-  req.set_form_data({'facts' => facts})
-  response = http.request(req)
-  puts response.body
-rescue Exception => e
-  raise "Could not send facts to Foreman: #{e}"
+  sleep 60
 end

data/lib/discovery_home_helper_patch.rb

@@ -11,10 +11,7 @@ module DiscoveryHomeHelperPatch
     # Adds a discovers link to the More menu
     def setting_options_with_discovers_link
       choices = setting_options_without_discovers_link
-      choices += [
-        [:divider],
-        ['Discovered Hosts', :discovers]
-      ]
+      choices[2][2].insert(2,['Discovered Hosts', :discovers])
       authorized_menu_actions(choices)
     end
   end

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/lib/tasks.rake

@@ -11,7 +11,13 @@ END_DESC
 namespace :discovery do
   task :build_image => :environment do
 
-    verbose = ENV['build_verbose'] && ENV['build_verbose'] != 'false' ? true : false
+    verbose = ( ENV['build_verbose'] and ENV['build_verbose'] != 'false' ) ? true : false
+    mode = case ENV['mode']
+           when /prod/
+             "prod"
+           else
+             "debug"
+           end
 
     # This requires a lot of root-level actions, lets ensure we have root access
     if Process.uid == 0 && Process.euid == 0
@@ -39,9 +45,8 @@ namespace :discovery do
 
     script=`bundle show foreman_discovery`.strip + '/extra/build_iso.sh'
     builddir=''
-    puts 'Building TCL Discovery Image - this may take a while'
     begin
-      status = Open4::popen4("#{prefix} #{script}") do |pid, stdin, stdout, stderr|
+      status = Open4::popen4("#{prefix} #{script} #{mode}") do |pid, stdin, stdout, stderr|
         puts "pid        : #{ pid }" if verbose
         stdrout=stdout.read.strip
         builddir = stdrout.split("\n").delete_if {|x| x !~ /#TMPDIR#/}.to_s.split(' ').last

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,6 @@ files:
 - extra/foreman_startup.rb
 - extra/disk_facts.rb
 - config/initializers/discovery_setup.rb
-- config/environment.rb
 - config/routes.rb
 - lib/foreman_discovery.rb
 - lib/foreman_discovery/engine.rb