foreman_discovery 1.2.0 → 1.3.0.rc1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2MwZjcwMGYzYWVmM2IzMTkxNmVlNDg2MGVmMjcxYjZjYTA2MzQzMQ==
-  data.tar.gz: !binary |-
-    Mzc5NWQ4ZmIyY2ViOWFjNjg1YTViODBhNjI4NTk1YmVkOTdmOGRlMw==
+SHA1:
+  metadata.gz: 24eedabca60396493d62ff3dfa144f4da8481034
+  data.tar.gz: 066958ace4619f3a24f5570c4f976b9b2219eb46
 SHA512:
-  metadata.gz: !binary |-
-    OGM3NTNlNDgxMmRmOGJkYjc5Yjg5N2EyYzgwNWU3MzkxNzMxNmUxMTU4YjVj
-    NDA2Y2RmMzE2ZDdmY2NhZDE5ZDYzNGYxNjg2MDE1YjNmMGRhNjRiMThiZDVk
-    MDFhNjBkNzExYTdmMDg3OWI1OGI4MjRiNWFmY2NlNWMwMWJkY2Q=
-  data.tar.gz: !binary |-
-    NDA5N2EzMjNmNDk0MTE5MTFiYzA3NTM2YmNjNjViZmRhNzUzZDUyNGVjNGFj
-    ZWIyMDlhYjc3OWIxZGZjZjdmNGIwMWRjYzIyNDQxNzZlZTAxY2M2OTI3NjEz
-    YjU4MTI4NzM2OTVlN2Q4OWNmZWI1YTQ0ODFiYThhNmRlZTk2YmM=
+  metadata.gz: 9da2be93c9e85e4d5783d29e81388c7ed656d768d7f643d8227eda0cf5a8cf43ffa4d7b8dbbfd9e45dd8288a690fc53bd50398a0681125056519c06648bc006b
+  data.tar.gz: 0eb4329f85cc0a246e07152bee098f0ca10d8b59d232e3555bd52aa678a7ff448947969c228f9127d01e25260bfb1aaf35c70c4a787392ea8198b335a48b8a31

data/README.md

@@ -18,7 +18,8 @@ RPM users can install the "ruby193-rubygem-foreman_discovery" or
 | Foreman Version | Plugin Version | oVirt Image Version |
 | --------------- | --------------:| -------------------:|
 | <= 1.2          | 1.0.2          | N/A                 |
-| >= 1.3          | 1.1.0          | 0.1.0               |
+|  = 1.3          | 1.1.0          | 0.1.0               |
+| >= 1.4          | 1.2.0          | 0.3.0-1             |
 
 ## Latest code
 
@@ -26,6 +27,12 @@ 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"
 
+## Reporting bugs
+
+We use [RedMine
+instance](http://projects.theforeman.org/projects/discovery/issues) instead of
+github.com issues.
+
 # Building or downloading an image
 
 There are two options at the moment:

data/app/controllers/discovers_controller.rb

@@ -121,6 +121,10 @@ class DiscoversController < ::ApplicationController
 
   private
 
+  def resource_base
+    @resource_base ||= ::Host::Discovered.authorized(current_permission, ::Host::Discovered)
+  end
+
   def load_vars_for_ajax
     return unless @host
 
@@ -142,10 +146,29 @@ class DiscoversController < ::ApplicationController
     @host.overwrite = "true" if @host.errors.any? and @host.errors.are_all_conflicts?
   end
 
+  def controller_permission
+    'discovered_hosts'
+  end
+
+  def action_permission
+    case params[:action]
+      when 'refresh_facts'
+        :view
+      when 'new', 'create'
+        :provision
+      when 'update_multiple_location', 'select_multiple_organization', 'update_multiple_organization', 'select_multiple_location'
+        :edit
+      when 'submit_multiple_destroy', 'multiple_destroy'
+        :destroy
+      else
+        super
+    end
+  end
+
   def find_by_name
     params[:id].downcase! if params[:id].present?
-    @host = ::Host::Discovered.find_by_id(params[:id])
-    @host ||= ::Host::Discovered.find_by_name(params[:id])
+    @host = resource_base.find_by_id(params[:id])
+    @host ||= resource_base.find_by_name(params[:id])
     return false unless @host
   end
 
@@ -162,6 +185,7 @@ class DiscoversController < ::ApplicationController
       redirect_to(discovers_path) and return false
     end
 
+    return @hosts
   rescue => e
     error _("Something went wrong while selecting hosts - %s") % e
     redirect_to discovers_path

data/app/helpers/discovers_helper.rb

@@ -20,15 +20,15 @@ module DiscoversHelper
   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]]
+    actions <<  [_('Assign Organization'), select_multiple_organization_discovers_path] if SETTINGS[:organizations_enabled]
+    actions <<  [_('Assign Location'), select_multiple_location_discovers_path] if SETTINGS[:locations_enabled]
 
-    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
+    select_action_button( _("Select Action"), {:id => 'submit_multiple'},
+      actions.map do |action|
+        link_to(action[0] , action[1], :'data-dialog-title' => _("%s - The following hosts are about to be changed") % action[0])
+      end.flatten
+    )
 
   end
 

data/app/models/host/discovered.rb

@@ -21,11 +21,11 @@ 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 facts
-    raise(::Foreman::Exception.new("Invalid Facts, must be a Hash")) unless facts.is_a?(Hash)
+  def self.import_host_and_facts facts
+    raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash)
     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
+    raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain the required fact '%s'"), fact_name)) unless hostname
 
     # filter facts
     facts.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem/i }
@@ -51,11 +51,11 @@ class Host::Discovered < ::Host::Base
     end
 
     h.save(:validate => false) if h.new_record?
-    state = h.importFacts(facts)
+    state = h.import_facts(facts)
     return h, state
   end
 
-  def importFacts facts
+  def import_facts 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
@@ -66,7 +66,7 @@ class Host::Discovered < ::Host::Base
     super + [:ip]
   end
 
-  def populateFieldsFromFacts facts = self.facts_hash
+  def populate_fields_from_facts facts = self.facts_hash
     importer = super
     self.subnet = Subnet.subnet_for(importer.ip)
     self.save
@@ -81,7 +81,7 @@ class Host::Discovered < ::Host::Base
       raise _("Could not get facts from proxy: %s") % e
     end
 
-    return self.class.importHostAndFacts facts
+    return self.class.import_host_and_facts facts
   end
 
   def self.model_name

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

@@ -4,15 +4,15 @@
   <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, :as => _('Name') %></th>
-    <th class="hidden-tablet hidden-phone"><%= sort :model, :as => _('Model') %></th>
+    <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
     <% if SETTINGS[:locations_enabled] -%>
-      <th class="hidden-tablet hidden-phone"><%= sort :location, :as => _('Location') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
     <% end -%>
     <% if SETTINGS[:organizations_enabled] -%>
-      <th class="hidden-tablet hidden-phone"><%= sort :organization, :as => _('Organization') %></th>
+      <th class="hidden-tablet hidden-xs"><%= 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 => _("Last facts upload") %></th>
+    <th class="hidden-tablet hidden-xs"><%= sort :subnet, :as => _("Subnet") %></th>
+    <th class="hidden-tablet hidden-xs"><%= sort :last_report, :as => _("Last facts upload") %></th>
     <th></th>
   </tr>
   <% @hosts.each do |host| -%>
@@ -21,15 +21,15 @@
         <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' -%>
       </td>
       <td><%= link_to("#{host}", discover_path(host) ) %> </td>
-      <td class="hidden-tablet hidden-phone"><%= model_name host %></td>
+      <td class="hidden-tablet hidden-xs"><%= model_name host %></td>
       <% if SETTINGS[:locations_enabled] -%>
-        <td class="hidden-tablet hidden-phone"><%= host.location.try(:name) %></td>
+        <td class="hidden-tablet hidden-xs"><%= host.location.try(:name) %></td>
       <% end -%>
       <% if SETTINGS[:organizations_enabled] -%>
-        <td class="hidden-tablet hidden-phone"><%= host.organization.try(:name) %></td>
+        <td class="hidden-tablet hidden-xs"><%= 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 class="hidden-tablet hidden-xs"><%= host.subnet %></td>
+      <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
         <%= action_buttons(
           link_to(_("Provision"), hash_for_edit_discover_path(:id => host)),
@@ -40,17 +40,23 @@
     <% end -%>
   </table>
 
-<div id="confirmation-modal" class="modal hide fade">
-  <div class="modal-header">
-    <a href="#" class="close" data-dismiss="modal">×</a>
-    <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>
-  </div>
-</div>
+<div id="confirmation-modal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><%= _('Please Confirm') %></h4>
+      </div>
+      <div class="modal-body">
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
+        <button type="button" class="btn btn-primary"><%= _('Submit') %></button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
 <%= page_entries_info @hosts %>
 <%= will_paginate @hosts %>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="span8">
+  <div class="col-md-8">
 
     <table class="table table-bordered table-striped">
       <thead>

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

@@ -1,6 +1,6 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 
-<%= form_tag submit_multiple_destroy_hosts_path(:host_ids => params[:host_ids]), :onsubmit => "resetSelection()" do -%>
+<%= form_tag submit_multiple_destroy_discovers_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') %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 <div class="row">
-  <div class="span8">
-    <%= form_for :location, :url => update_multiple_location_hosts_path(:host_ids => params[:host_ids]) do |f| %>
+  <div class="col-md-8">
+    <%= form_for :location, :url => update_multiple_location_discovers_path(:host_ids => params[:host_ids]) do |f| %>
       <%= 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" %>

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

@@ -1,7 +1,7 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 <div class="row">
-  <div class="span8">
-    <%= form_for :organization, :url => update_multiple_organization_hosts_path(:host_ids => params[:host_ids]) do |f| %>
+  <div class="col-md-8">
+    <%= form_for :organization, :url => update_multiple_organization_discovers_path(:host_ids => params[:host_ids]) do |f| %>
       <%= 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" %>

data/extra/build_iso.sh

@@ -88,7 +88,7 @@ fi
 
 # Build the init script
 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/wait_for_network.sh" >> opt/bootlocal.sh # network can be slow to come up
 echo "/opt/foreman_startup.rb" >> opt/bootlocal.sh
 echo "/opt/discovery_init.sh" >> opt/bootlocal.sh
 
@@ -96,9 +96,19 @@ echo "/opt/discovery_init.sh" >> opt/bootlocal.sh
 cp $SCRIPT_DIR/foreman_startup.rb opt/foreman_startup.rb
 chmod 755 opt/foreman_startup.rb
 
+# Copy the script that wait for network before trying to use it
+cp $SCRIPT_DIR/wait_for_network.sh opt/wait_for_network.sh
+chmod 755 opt/wait_for_network.sh
+
 # Get the gems
 mkdir opt/gems && cd opt/gems
-for n in $GEMS ; do gem fetch $n ; done
+gem fetch facter
+gem fetch json_pure
+gem fetch rack
+gem fetch rack-protection
+# Explicit version for tilt or it brakes sinatra (actual tilt version >= 2.0.0) :
+gem fetch --version 1.3.4 tilt
+gem fetch sinatra
 
 # Build the fallback script
 echo "#!/bin/sh" >> ../discovery_init.sh

data/extra/ovirt-node-build/Vagrantfile

@@ -0,0 +1,55 @@
+# vim: sw=2:ts=2:et:ft=ruby
+
+box = {:name => 'f19', :libvirt => 'fm-fedora19',   :image_name => /Fedora.*19/, :pty => true}
+
+if ENV['box']
+  box = {:name => ENV['box'], :libvirt => ENV['box'], :image_name => ENV['box'], :os_user => ENV['box']}
+end
+
+Vagrant.configure("2") do |config|
+  config.vm.define box[:name], primary: box[:default] do |machine|
+    machine.vm.box = box[:name]
+    machine.vm.hostname = "foreman-#{box[:name]}.bulder.theforeman.org"
+    machine.vm.provision :shell, :path => 'build_image.sh', :args => [
+      ENV['base_image_url'],
+      ENV['buildnumber'],
+      ENV['proxy_repo'],
+      ENV['repoowner'],
+      ENV['branch'],
+    ]
+
+    machine.vm.provider :libvirt do |p, override|
+      override.vm.box = "#{box[:libvirt]}"
+      override.vm.box_url = "http://m0dlx.com/files/foreman/boxes/#{box[:libvirt].sub(/^fm-/, '')}.box"
+      p.memory = 1024
+    end
+
+    machine.vm.provider :rackspace do |p, override|
+      override.vm.box = 'dummy'
+      p.server_name = machine.vm.hostname
+      p.flavor = /1GB/
+      p.image = box[:image_name]
+      override.ssh.pty = true if box[:pty]
+    end
+
+    # ~/.vagrant.d/Vagrantfile will need
+    # config.ssh.private_key_path = "~/.ssh/id_rsa"          # private key for keypair below
+
+    config.vm.provider :openstack do |p, override|
+      override.vm.box = 'dummy'
+      p.server_name   = machine.vm.hostname
+      p.flavor        = /m1.tiny/
+      p.image         = box[:image_name] # Might as well use consistent image names
+      p.ssh_username  = box[:os_user]  # login for the VM
+
+      # ~/.vagrant.d/Vagrantfile will need
+      # p.username     = "admin"                             # e.g. "#{ENV['OS_USERNAME']}"
+      # p.api_key      = "secret"                            # e.g. "#{ENV['OS_PASSWORD']}"
+      # p.endpoint     = "http://openstack:5000/v2.0/tokens" # e.g. "#{ENV['OS_AUTH_URL']}/tokens"
+      # p.keypair_name = "my_key"                            # as stored in Nova
+
+      # You may need
+      # p.floating_ip = '172.20.10.160' # Must be hardcoded, cannot ask Openstack for an IP
+    end
+  end
+end

data/extra/ovirt-node-build/build_image.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+# vim: sw=2:ts=2:et
+set -x
+
+base_image_url=${1}
+buildnumber=${2}
+proxy_repo=${3}
+repoowner=${4}
+branch=${5}
+
+echo Building $repoowner/$branch from $base_image_url and $proxy_repo
+
+cat > ./fedora.repo <<'EOF'
+[fedora-edit-node]
+name=Fedora $releasever - $basearch
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+baseurl=http://mirror.rackspace.com/fedora/releases/$releasever/Everything/$basearch/os/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+retries=200
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+
+[updates-edit-node]
+name=Fedora $releasever - $basearch - Updates
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
+baseurl=http://mirror.rackspace.com/fedora/updates/$releasever/$basearch/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+retries=200
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+EOF
+
+cat > ./foreman.repo <<EOF2
+[foreman]
+name=Foreman nightly
+baseurl=$proxy_repo
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-foreman
+EOF2
+
+cat fedora.repo foreman.repo > edit-node.repo
+
+export OVIRT_NODE_BASE=$PWD
+export OVIRT_CACHE_DIR=~/ovirt-cache
+export OVIRT_LOCAL_REPO=file://${OVIRT_CACHE_DIR}/ovirt
+mkdir -p $OVIRT_CACHE_DIR
+
+# give the VM some time to finish booting and network configuration
+sleep 40
+
+yum -y install livecd-tools appliance-tools-minimizer fedora-packager \
+    python-devel rpm-build createrepo selinux-policy-doc checkpolicy \
+    selinux-policy-devel autoconf automake python-mock python-lockfile git wget
+git clone http://gerrit.ovirt.org/p/ovirt-node.git
+git clone http://gerrit.ovirt.org/p/ovirt-node-iso.git
+git clone https://github.com/$repoowner/foreman_discovery.git -b $branch
+
+BASE_IMAGE=$(basename $base_image_url)
+VERSION=$(grep AC_INIT foreman_discovery/extra/ovirt-node-plugin-foreman/configure.ac | grep -oE '[0-9].[0-9].[0-9]')-$buildnumber
+
+wget -q -nc -c "$base_image_url"
+
+function build() {
+        RPMSDIR=$(rpm --eval '%{_rpmdir}')
+        rm -f $RPMSDIR/noarch/*rpm
+        pushd foreman_discovery/extra/ovirt-node-plugin-foreman
+        git pull
+        make distclean
+        if [[ "$1" == "debug" ]]; then
+                ./autogen.sh --enable-debug && make rpms
+        else
+                ./autogen.sh && make rpms
+        fi
+        popd
+        cat edit-node.repo
+        ovirt-node/tools/edit-node --repo edit-node.repo --nogpgcheck \
+                --install $RPMSDIR/noarch/ovirt-node-plugin-foreman-0*.rpm \
+                $BASE_IMAGE
+        echo edit-node returned: $?
+        mv -f ovirt-node-iso-*.foreman.*.iso foreman.iso
+        rm -rf tftpboot
+        livecd-iso-to-pxeboot foreman.iso
+        mv -f tftpboot/vmlinuz0 discovery-$1-$VERSION-vmlinuz
+        mv -f tftpboot/initrd0.img discovery-$1-$VERSION-initrd.img
+        mv -f foreman.iso foreman-discovery-$1-$VERSION.iso
+}
+
+build prod
+build debug
+
+

data/extra/ovirt-node-plugin-foreman/configure.ac

@@ -17,7 +17,7 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-AC_INIT([ovirt-node-plugin-foreman], [0.3.0], [foreman-dev@googlegroups.com])
+AC_INIT([ovirt-node-plugin-foreman], [0.3.1], [foreman-dev@googlegroups.com])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax])
 AC_SUBST([ENGINENAME], ['Foreman Discovery'])
 PKG_PROG_PKG_CONFIG

data/extra/ovirt-node-plugin-foreman/src/discover-host.rb.in

@@ -29,6 +29,8 @@ require 'fileutils'
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'socket'
+require 'resolv'
 
 # For comparison
 require 'rubygems'
@@ -74,73 +76,89 @@ def error msg
   $stderr.puts "#{time_prefix} #{msg}"
 end
 
-def cmdline
-  return File.open("/proc/cmdline", 'r') { |f| f.read }
+def cmdline option=nil, default=nil
+  line = File.open("/proc/cmdline", 'r') { |f| f.read }
+  if option
+    result = line.split.map { |x| $1 if x.match(/^#{option}=(.*)/)}.compact
+    result.size == 1 ? result.first : default
+  else
+    line
+  end
 end
 
 def discover_server
   debug "Parsing kernel line: #{cmdline}"
-  server = (discover_by_pxe or discover_by_dns)
-  unless server =~ /^http/
-    server = "http://#{server}"
-  end
-  server
+  discover_by_url or discover_by_ip or
+    discover_by_server or discover_by_dns_srv
 end
 
-def discover_by_pxe
-  begin
-    server_ip = cmdline.split.map { |x| $1 if x.match(/foreman.ip=(.*)/)}.compact
-    if server_ip.size == 1
-      result = server_ip.join
-      println "Discovered by PXE: #{result}"
-      return result
-    else
-      return false
-    end
-  rescue
-    return false
-  end
+# kept for backward compatibility
+def discover_by_ip
+  ip = cmdline 'foreman.ip'
+  println "Discovered by PXE: #{ip}" if ip
+  URI.parse("http://#{ip}")
+rescue
+  return nil
+end
+
+# kept for backward compatibility
+def discover_by_server
+  server = cmdline 'foreman.server'
+  println "Discovered by SERVER: #{server}" if server
+  URI.parse("http://#{server}")
+rescue
+  return nil
 end
 
-def discover_by_dns
-  begin
-    server_name = cmdline.split.map { |x| $1 if x.match(/foreman.server=(.*)/)}.compact
-    server_name = server_name.size == 1 ? server_name.join : 'foreman'
+def discover_by_url
+  url = cmdline 'foreman.url'
+  println "Discovered by URL: #{url}" if url
+  URI.parse(url)
+rescue
+  return nil
+end
 
-    require 'socket'
-    result = TCPSocket.gethostbyname(server_name)[3..-1].first || false
-    println "Discovered by DNS: #{result}"
-    return result
-  rescue
-    return false
+# SRV discovery will work only if DHCP returns valid search domain
+def discover_by_dns_srv
+  resolver = Resolv::DNS.new
+  type = Resolv::DNS::Resource::IN::SRV
+  result = resolver.getresources("_x-foreman._tcp", type).first
+  hostname = result.target.to_s
+  if result.port == 443
+    scheme = 'https'
+  else
+    scheme = 'http'
   end
+  uri = "#{scheme}://#{hostname}:#{result.port}"
+  println "Discovered by SRV: #{uri}"
+  URI.parse(uri)
+rescue
+  return nil
 end
 
 def upload
   ip = Facter.value('ipaddress')
-  server = discover_server
-  println "Triggering import of facts from Foreman (#{server}, ip=#{ip})"
+  uri = discover_server
+  error "Could not determine Foreman instance, add kernel command option" unless uri
+  println "Triggering import of facts from Foreman (#{uri}, ip=#{ip})"
   data = ip.nil? ? {} : {'ip' => ip}
-  begin
-    uri = URI.parse(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(data)
-    response = http.request(req)
-    debug "Response from Foreman #{response.code}: #{response.body}"
-    if response.code == "200"
-      return true
-    else
-      return false
-    end
-  rescue Exception => e
-    error "Could not send facts to Foreman: #{e}"
+  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(data)
+  response = http.request(req)
+  debug "Response from Foreman #{response.code}: #{response.body}"
+  if response.code == "200"
+    return true
+  else
     return false
   end
+rescue => e
+  error "Could not send facts to Foreman: #{e}"
+  return false
 end
 
 def write_cache(data)
@@ -172,15 +190,15 @@ end
 println "Some interesting facts about this system:"
 facts = Facter.to_hash.select {|k,v| k =~ /address|hardware|manufacturer|productname|memorytotal/}
 facts.keys.sort.each {|k| println " #{k}: #{facts[k]}"}
-println "\nLogs from discovery services now follows:"
+println "Logs from discovery services now follows:"
 
 # loop, but only upload on changes
 while true do
-  sleep DEBUG ? 30 : 60
   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
     debug "Fact cache invalid, reloading to foreman"
     write_cache(YAML.dump(facts)) if upload
+    sleep DEBUG ? 30 : 60
   end
 end

data/extra/wait_for_network.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+n=1
+
+for x in `cat /proc/cmdline`
+do
+    case $x in
+        foreman.ip=*)
+            server="${x//foreman.ip=}"
+        ;;
+        foreman.server=*)
+            server="${x//foreman.server=}"
+        ;;
+    esac
+done
+
+echo "Testing ping to $server to see if network is up..."
+
+until ping -w 1 -c 1 "$server" &>/dev/null ;do
+    sleep 1
+    n=$(( n+1 ))
+    [ $n -eq 180 ] && break
+done
+

data/lib/foreman_discovery/engine.rb

@@ -26,17 +26,17 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.4'
+        requires_foreman '> 1.4'
 
         # Add permissions
         security_block :discovery do
-          permission :view_discovered_hosts, {:discovers => [:index, :show, :auto_complete_search, :refresh_facts] }
-          permission :provision_discovered_hosts, {:discovers => [:new, :create] }
+          permission :view_discovered_hosts, {:discovers => [:index, :show, :auto_complete_search, :refresh_facts] }, :resource_type => 'Host'
+          permission :provision_discovered_hosts, {:discovers => [:new, :create] }, :resource_type => 'Host'
           permission :edit_discovered_hosts, {:discovers => [:edit, :update, :update_multiple_location,
                                                              :select_multiple_organization,
                                                              :update_multiple_organization,
-                                                             :select_multiple_location] }
-          permission :destroy_discovered_hosts, {:discovers => [:destroy, :submit_multiple_destroy, :multiple_destroy] }
+                                                             :select_multiple_location] }, :resource_type => 'Host'
+          permission :destroy_discovered_hosts, {:discovers => [:destroy, :submit_multiple_destroy, :multiple_destroy] }, :resource_type => 'Host'
 
         end
 

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.2.0"
+  VERSION = "1.3.0.rc1"
 end

data/locale/{discovery.pot → foreman_discovery.pot}

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-24 13:57+0100\n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
 "PO-Revision-Date: 2013-03-01 15:45-0500\n"
 "Last-Translator: \n"
 "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -83,6 +83,12 @@ msgstr ""
 msgid "Imported Host::Discovered"
 msgstr ""
 
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
 msgid "Last facts upload"
 msgstr ""
 
@@ -116,7 +122,7 @@ msgstr ""
 msgid "Refresh facts"
 msgstr ""
 
-msgid "Select action"
+msgid "Select Action"
 msgstr ""
 
 msgid "Select all items in this page"

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ftools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'MaaS Discovery Plugin engine for Foreman '
+description: 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
 extensions: []
@@ -60,67 +60,66 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- LICENSE
-- README.md
-- Rakefile
-- app/controllers/discovers_controller.rb
+- app/overrides/add_dashboard_table.rb
 - app/helpers/discovers_helper.rb
 - app/models/host/discovered.rb
 - app/models/host/managed_extensions.rb
 - app/models/setting/discovered.rb
-- app/overrides/add_dashboard_table.rb
-- app/views/discovers/_discovers_list.html.erb
-- app/views/discovers/_selected_hosts.html.erb
+- app/controllers/discovers_controller.rb
 - app/views/discovers/index.html.erb
-- app/views/discovers/multiple_destroy.html.erb
+- app/views/discovers/_selected_hosts.html.erb
+- app/views/discovers/show.html.erb
 - app/views/discovers/select_multiple_location.html.erb
+- app/views/discovers/_discovers_list.html.erb
+- app/views/discovers/multiple_destroy.html.erb
 - app/views/discovers/select_multiple_organization.html.erb
-- app/views/discovers/show.html.erb
-- config/initializers/discovery_setup.rb
-- config/routes.rb
-- extra/build_iso.sh
-- extra/discover_host
-- extra/discovery_init.sh.example
-- extra/disk_facts.rb
-- extra/foreman_startup.rb
-- extra/ovirt-node-plugin-foreman/COPYING
-- extra/ovirt-node-plugin-foreman/Makefile.am
 - extra/ovirt-node-plugin-foreman/README.md
-- extra/ovirt-node-plugin-foreman/autogen.sh
-- extra/ovirt-node-plugin-foreman/conf/Makefile.am
-- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.firewall.in
-- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.logs
-- extra/ovirt-node-plugin-foreman/configure.ac
 - extra/ovirt-node-plugin-foreman/ovirt-node-plugin-foreman.spec.in
-- extra/ovirt-node-plugin-foreman/recipe/Makefile.am
 - extra/ovirt-node-plugin-foreman/recipe/foreman-plugin-iso.ks
 - extra/ovirt-node-plugin-foreman/recipe/foreman-plugin-minimizer.ks
-- extra/ovirt-node-plugin-foreman/src/Makefile.am
+- extra/ovirt-node-plugin-foreman/recipe/Makefile.am
+- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.firewall.in
+- extra/ovirt-node-plugin-foreman/conf/Makefile.am
+- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.logs
+- extra/ovirt-node-plugin-foreman/src/find-missing-libs
+- extra/ovirt-node-plugin-foreman/src/discovery-version-fact.rb.in
 - extra/ovirt-node-plugin-foreman/src/discover-host.rb.in
 - extra/ovirt-node-plugin-foreman/src/discover-host.service
-- extra/ovirt-node-plugin-foreman/src/discovery-version-fact.rb.in
-- extra/ovirt-node-plugin-foreman/src/find-missing-libs
+- extra/ovirt-node-plugin-foreman/src/Makefile.am
+- extra/ovirt-node-plugin-foreman/configure.ac
+- extra/ovirt-node-plugin-foreman/Makefile.am
+- extra/ovirt-node-plugin-foreman/COPYING
+- extra/ovirt-node-plugin-foreman/autogen.sh
+- extra/build_iso.sh
+- extra/discover_host
+- extra/wait_for_network.sh
+- extra/ovirt-node-build/build_image.sh
+- extra/ovirt-node-build/Vagrantfile
+- extra/discovery_init.sh.example
+- extra/foreman_startup.rb
+- extra/disk_facts.rb
+- config/initializers/discovery_setup.rb
+- config/routes.rb
 - lib/discovery.rake
-- lib/foreman_discovery.rb
 - lib/foreman_discovery/engine.rb
-- lib/foreman_discovery/facts.rb
 - lib/foreman_discovery/version.rb
-- locale/Makefile
-- locale/discovery.pot
-- locale/en_GB/LC_MESSAGES/discovery.mo
+- lib/foreman_discovery/facts.rb
+- lib/foreman_discovery.rb
+- locale/sv_SE/discovery.po
+- locale/fr/discovery.po
 - locale/en_GB/discovery.po
-- locale/es/LC_MESSAGES/discovery.mo
+- locale/foreman_discovery.pot
 - locale/es/discovery.po
-- locale/fr/LC_MESSAGES/discovery.mo
-- locale/fr/discovery.po
-- locale/sv_SE/LC_MESSAGES/discovery.mo
-- locale/sv_SE/discovery.po
-- test/functional/discovers_controller_test.rb
+- locale/Makefile
+- LICENSE
+- Rakefile
+- README.md
 - test/test_helper.rb
-- test/test_plugin_helper.rb
 - test/unit/facts.json
 - test/unit/host_discovered_test.rb
 - test/unit/setting_discovered_test.rb
+- test/functional/discovers_controller_test.rb
+- test/test_plugin_helper.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
 - GPL-3
@@ -131,24 +130,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/functional/discovers_controller_test.rb
+- test/test_helper.rb
 - test/unit/facts.json
-- test/unit/setting_discovered_test.rb
 - test/unit/host_discovered_test.rb
+- test/unit/setting_discovered_test.rb
+- test/functional/discovers_controller_test.rb
 - test/test_plugin_helper.rb
-- test/test_helper.rb
+has_rdoc: