foreman_discovery 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656e9f2818bcdad46262d38097418179eec470a5
-  data.tar.gz: 4218abd9ac5914ddd043ed70f8b34354b49390fe
+  metadata.gz: 321fccd57e6e597e9d144fbdfed50b2ebf31060a
+  data.tar.gz: d51274ca2f006f8c2ceb300a1cb7690c80eb4aeb
 SHA512:
-  metadata.gz: a23c7e8e8e811966c70ec5040542a9661792553129eb84ebc35c1124db82dabc600c2e26b4505723f6de9a11abd85c9ad1aeb9ad4b4f6c547bfc4617fd912c8c
-  data.tar.gz: 79f1907987a75bc7efaf4ec11f3ad7276e68bc3ef994ec625142906ee167cca9c9c5dd69b6e4b2305a4f1923b0e6b1bec128880e1ab02cad8d66a2f2edaf64a0
+  metadata.gz: 397579ca7a041155026bfdd6d1bd4ff189319e4f980c41a9ae706dc1e7c1444eefbc70c05eeed8bf3ea812dbf394d0206850f5a91303636b5e10f064003b174b
+  data.tar.gz: bcb39a17222301d169f9b06ec1dadf281bfe528683370d64ae2abe5fc7260fa4f6268ce1ade4641b9f26edab3323edf55e3279fff3a085297df84661418c586b

data/README.md

@@ -1,31 +1,22 @@
 # foreman\_discovery
 
-This plugin aims to enable MaaS hardware discovery in Foreman. It is of alpha quality
-right now ;)
+This plugin enables MaaS hardware discovery in Foreman.
 
-# Dependencies
+## Installation
 
-* Foreman >= 1.2.0
+See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
+for how to install Foreman plugins
 
-# Installation
+## Compatibility
 
-Require the gem in Foreman by creating `bundler.d/Gemfile.local.rb` with the following:
-
-    gem 'foreman_discovery'
-
-SCL-based OSes (i.e. EL6) will want to avoid a large number of dependencies by doing this:
-
-    yum -y install ruby193-rubygem-nokogiri && scl enable ruby193 'gem install foreman_discovery' 
-
-Other OSes should run:
-
-    bundle update
-
-Lastly, restart Foreman.
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| <= 1.2          | 1.0.2          |
+| >= 1.3          | 1.1.0          |
 
 ## Latest code
 
-You can get the develop branch of the plugin this way:
+You can get the develop branch of the plugin by specifying your Gemfile in this way:
 
     gem 'foreman_discovery', :git => "https://github.com/theforeman/foreman_discovery.git"
 
@@ -35,14 +26,9 @@ 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
-
-Note: If you are using RHEL6 or clones, make sure you run the above command
-with the SCL Ruby:
+Run this rake task to create the image:
 
-    scl enable ruby193 "rake discovery:build_image"
+    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.

data/app/controllers/discovers_controller.rb

@@ -8,7 +8,7 @@ class DiscoversController < ::ApplicationController
 
   before_filter :find_by_name, :only => %w[show edit update destroy refresh_facts convert]
   before_filter :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy]
-  before_filter :taxonomy_scope, :only => [:edit] 
+  before_filter :taxonomy_scope, :only => [:edit]
 
   helper :hosts
 
@@ -26,20 +26,20 @@ class DiscoversController < ::ApplicationController
   # 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
+      host, 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
+            render :text => _("Imported Host::Discovered"), :status => 200 and return
           else
-            render :text => _("Failed to import facts"), :status => 400
+            render :text => _("Failed to import facts for Host::Discovered"), :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
+    logger.warn "Failed to import facts for Host::Discovered: #{e}"
+    render :text => _("Failed to import facts for Host::Discovered: %s") % (e), :status => 400
   end
 
   def show
@@ -72,6 +72,7 @@ class DiscoversController < ::ApplicationController
       if @host.update_attributes(params[:host])
         process_success :success_redirect => host_path(@host), :redirect_xhr => request.xhr?
       else
+        taxonomy_scope
         load_vars_for_ajax
         offer_to_overwrite_conflicts
         process_error :object => @host, :render => 'hosts/edit'

data/app/models/host/discovered.rb

@@ -21,32 +21,18 @@ class Host::Discovered < ::Host::Base
   # 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
-    facts = data.is_a?(Hash) ? data : YAML::load(data)
-    case facts
-      # Discovered hosts don't have a name yet - use MAC for now
-      # TODO: make this more intelligent, we might not have an eth0...
-      when Puppet::Node::Facts
-        name   = facts.values["macaddress_eth0"].downcase.gsub(/:/,'')
-        values = facts.values
-      when Hash
-        name   = facts["macaddress_eth0"].downcase.gsub(/:/,'')
-        values = facts
-        return raise("invalid facts hash") unless name and values
-      else
-        return raise("Invalid Facts, much be a Puppet::Node::Facts or a Hash")
-    end
+  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
 
     # filter facts
-    values.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|version/i }
 
-    if name
-      h = ::Host::Discovered.find_by_name name
-    end
-    h ||= Host.new :name => name, :type => "Host::Discovered"
+    h = ::Host::Discovered.find_by_name hostname
+    h ||= Host.new :name => hostname, :type => "Host::Discovered"
     h.type = "Host::Discovered"
-    h.mac = values["macaddress_eth0"].downcase
+    h.mac = facts["macaddress_eth0"].try(:downcase)
 
     if SETTINGS[:locations_enabled]
       begin
@@ -63,11 +49,12 @@ class Host::Discovered < ::Host::Base
       end
     end
 
-    h.save if h.new_record?
-    h.importFacts(name, values)
+    h.save(:validate => false) if h.new_record?
+    state = h.importFacts(facts)
+    return h, state
   end
 
-  def importFacts name, facts
+  def importFacts facts
     # Discovered Hosts won't report in via puppet, so we can use that field to
     # record the last time it sent facts...
     self.last_report = Time.now

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.0.2"
+  VERSION = "1.1.1"
 end

data/lib/tasks.rake

@@ -43,7 +43,7 @@ namespace :discovery do
       exit 1
     end
 
-    script=`bundle show foreman_discovery`.strip + '/extra/build_iso.sh'
+    script = File.join(File.dirname(__FILE__), '..', 'extra', 'build_iso.sh')
     builddir=''
     begin
       status = Open4::popen4("#{prefix} #{script} #{mode}") do |pid, stdin, stdout, stderr|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4