foreman_discovery 1.0.0.rc4 → 1.0.0

data/README.md

@@ -5,7 +5,7 @@ right now ;)
 
 # Dependencies
 
-* Foreman running from commit e36b1d6689773a9b (or newer)
+* Foreman >= 1.2.0
 
 # Installation
 
@@ -24,7 +24,11 @@ Update & Restart Foreman:
 
 # Building the Discovery PXE Image
 
-There is a rake task for the discovery image. Run this in the Foreman app root:
+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.
+
+Run this in the Foreman app root:
 
     rake discovery:build_image
 
@@ -75,6 +79,20 @@ specify a DNS record (`foreman.server=myforemanhost`) but in this case the port
 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,

data/app/overrides/add_dashboard_table.rb

@@ -0,0 +1,11 @@
+Deface::Override.new(:virtual_path => "dashboard/_status_table",
+                     :name => "add_dashboard_table",
+                     :insert_after => "ul:last",
+                   :text => '
+<h4 class="header"><%= "Host Pool" -%></h4>
+<ul>
+  <li>
+    <%= link_to("Unassigned Hosts", discovers_path, :class=>"dashboard-links" ) %>
+    <h4><%= Host::Discovered.count %></h4>
+  </li>
+</ul>')

data/extra/build_iso.sh

@@ -17,6 +17,8 @@ if [[ $MODE == 'debug' ]] ; then
   TGZS="$TGZS gcc_libs openssl-1.0.0 openssh"
 fi
 
+DIRNAME=`dirname $0`
+SCRIPT_DIR=`readlink -f $DIRNAME`
 LAUNCH_DIR=`pwd`
 TOPDIR=`mktemp -d`
 cd $TOPDIR
@@ -44,6 +46,7 @@ ln -s /usr/local/sbin/dmidecode usr/sbin/dmidecode
 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
+wget -O ./additional_build_files/netinfo.rb https://github.com/ohadlevy/puppet-network/raw/master/lib/facter/netinfo.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 .
@@ -90,7 +93,7 @@ echo "/opt/foreman_startup.rb" >> opt/bootlocal.sh
 echo "/opt/discovery_init.sh" >> opt/bootlocal.sh
 
 # Get the downloader
-cp `dirname $0`/foreman_startup.rb opt/foreman_startup.rb
+cp $SCRIPT_DIR/foreman_startup.rb opt/foreman_startup.rb
 chmod 755 opt/foreman_startup.rb
 
 # Get the gems
@@ -132,9 +135,22 @@ wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.24.tgz
 mkdir tmp-install-rubygems && cd tmp-install-rubygems
 mkdir rubygems
 tar xvzf ../rubygems-1.8.24.tgz && cd rubygems-1.8.24
-ruby setup.rb --destdir=../rubygems --prefix=/usr/local
+if [[ `readlink -f /usr/bin/ruby` =~ 1.9 ]] ; then
+  rubybin=ruby1.8
+else
+  rubybin=ruby
+fi
+$rubybin setup.rb --destdir=../rubygems --prefix=/usr/local
 cd ../rubygems
-sed -i 's?#!.*?#!/usr/local/bin/ruby?' ./usr/local/bin/gem
+# Detect gem executable
+if [ -f ./usr/local/bin/gem ] ; then
+  echo "Found proper gem executable"
+  sed -i 's?#!.*?#!/usr/local/bin/ruby?' ./usr/local/bin/gem
+else
+  echo "Found gem1.8 executable"
+  sed -i 's?#!.*?#!/usr/local/bin/ruby?' ./usr/local/bin/gem1.8
+  ln -snf /usr/local/bin/gem1.8 ./usr/local/bin/gem
+fi
 mkdir ./usr/local/lib/ruby/1.8 -p
 mv ./usr/local/lib/* ./usr/local/lib/ruby/1.8
 chown -R 0:0 .
@@ -148,7 +164,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
-cp `dirname $0`/discover_host ./proxy/usr/share/foreman-proxy/bin/discover_host
+cp $SCRIPT_DIR/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

@@ -47,6 +47,8 @@ end
 
 def upload
   puts "#{Time.now}: Triggering import of facts from Foreman"
+  ip = Facter.value('ipaddress') 
+  data = ip.nil? ? {} : {'ip' => ip}
   begin
     uri = URI.parse(discover_server)
     http = Net::HTTP.new(uri.host, uri.port)
@@ -55,7 +57,7 @@ def upload
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
     req = Net::HTTP::Post.new("/discovers")
-    req.set_form_data({})
+    req.set_form_data(data)
     response = http.request(req)
     puts response.body
   rescue Exception => e

data/lib/discovery_home_helper_patch.rb

@@ -3,16 +3,16 @@ module DiscoveryHomeHelperPatch
     base.send(:include, InstanceMethods)
 
     base.class_eval do
-      alias_method_chain :setting_options, :discovers_link
+      alias_method_chain :settings_menu_items, :discovers_link
     end
   end
 
   module InstanceMethods
     # Adds a discovers link to the More menu
-    def setting_options_with_discovers_link
-      choices = setting_options_without_discovers_link
-      choices[2][2].insert(2,['Discovered Hosts', :discovers])
-      authorized_menu_actions(choices)
+    def settings_menu_items_with_discovers_link
+      menu_items = settings_menu_items_without_discovers_link
+      menu_items[2][2].insert(2,['Discovered Hosts', :discovers]) if menu_items[2]
+      menu_items
     end
   end
 end

data/lib/foreman_discovery/engine.rb

@@ -1,3 +1,4 @@
+require 'deface'
 require 'discovery_home_helper_patch'
 
 module ForemanDiscovery

data/lib/foreman_discovery/version.rb

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

data/lib/tasks.rake

@@ -49,7 +49,7 @@ namespace :discovery do
       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
+        builddir = stdrout.split("\n").delete_if {|x| x !~ /#TMPDIR#/}.to_s.split(' ').last.sub(/[\]\"]+/,"")
         puts "stdout     : #{ stdrout }" if verbose
         puts "stderr     : #{ stderr.read.strip }" if verbose
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
@@ -68,6 +84,7 @@ extra_rdoc_files:
 - README.md
 files:
 - app/helpers/discovers_helper.rb
+- app/overrides/add_dashboard_table.rb
 - app/models/setting/discovered.rb
 - app/models/host/managed_extensions.rb
 - app/models/host/discovered.rb
@@ -1451,9 +1468,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23