foreman_discovery 1.4.0.rc4 → 1.4.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4106b050ad142a2bdf51a3d0502efa0842136b33
-  data.tar.gz: 931495a77ba85f9429b87560241687b11f307c96
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzQ0MGMzMTczYWU0ZGY0ZTY4MmE5YjcxMDIyM2M1YmMyMTliNWY5MQ==
+  data.tar.gz: !binary |-
+    NGUwNThkYjM1OTNlMzhiNmM2MjYxOTZhZThkYzY2NGM5OWE2NzE3ZA==
 SHA512:
-  metadata.gz: d1e1efbdccbc1c6917f4f4cde2e3af3d543295b0a2002ef2ea6308aca499bcf684eece46fb587f103c385cd5b8d697046d49192c9800eb599eb4172a74dd35ad
-  data.tar.gz: c45046a056199bcda6188e14c09409ff69388ea2efa7e261537bc6ec860de9fb6a53d1535e756e54ad2a93865ddba02e2600bbdd07d9736e9fd028ed501f37eb
+  metadata.gz: !binary |-
+    YThhN2ViNDhlZjg5M2UyYzZlOGY4ZjI4YWIwNjZkNzU2ZTIwZDMzMGQyMmE5
+    MTNkZjkyODllZWUwODM3MTFiNTBiZDA5NDdkNjk4NzM1MTMyOWViOTRiOTcz
+    MWFlMWIxMjY3MzM2OTYyZTY3MzQ4MmIyZjU4ZWZhZTcxZjMwNTY=
+  data.tar.gz: !binary |-
+    M2Y1ZmQwNDNlODIzMDUwOTMwZGRmOTY5ZWJkYzVmY2I5MjE1OWI4ZjMxNmFi
+    YzEyNzdmMDc2NGIxMGM4ZjFiMTQ0NDJmOTZjOGFiNDc1N2NiM2E1MjFhNmI3
+    NzM0YTI1ZWU3YWE0ZWMyMDJkOTc2MTM5NzNjNzRkZTQwMWE5MGM=

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -71,6 +71,7 @@ module Api
         param :managed, :bool
         param :progress_report_id, String, :desc => N_("UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks")
         param :capabilities, String
+        param :root_pass, String, :desc => N_("required if value is not inherited from host group or default password in settings")
       end
 
       def update

data/app/controllers/discovered_hosts_controller.rb

@@ -20,7 +20,7 @@ class DiscoveredHostsController < ::ApplicationController
       format.html do
         @hosts = search.paginate(:page => params[:page])
       end
-      format.json { render :json => hosts }
+      format.json { render :json => search }
     end
   end
 

data/app/models/host/discovered.rb

@@ -77,7 +77,7 @@ class Host::Discovered < ::Host::Base
 
   def populate_fields_from_facts facts = self.facts_hash, type = 'puppet'
     # type arg only added in 1.7
-    if Gem::Dependency.new('', '> 1.6').match?('', SETTINGS[:version].notag)
+    if Gem::Dependency.new('', '>= 1.7').match?('', SETTINGS[:version].notag)
       importer = super
     else
       importer = super(facts)

data/extra/ovirt-node-build/Vagrantfile

@@ -7,7 +7,7 @@ if ENV['box']
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.define box[:name], primary: box[:default] do |machine|
+  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 => [

data/lib/discovery.rake

@@ -95,7 +95,7 @@ Rake::Task[:test].enhance do
 end
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:setup')
+if Rake::Task.task_defined?(:'jenkins:unit')
   Rake::Task["jenkins:unit"].enhance do
     Rake::Task['test:discovery'].invoke
   end

data/lib/foreman_discovery/version.rb

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

data/test/unit/host_discovered_test.rb

@@ -4,9 +4,9 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login "admin"
     FactoryGirl.create(:setting,
-                       name: 'discovery_fact',
-                       value: 'macaddress',
-                       category: 'Setting::Discovered')
+                       :name     => 'discovery_fact',
+                       :value    => 'macaddress',
+                       :category => 'Setting::Discovered')
   end
 
   test "should be able to create Host::Discovered objects" do

metadata

@@ -1,44 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc4
+  version: 1.4.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-30 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'
-description: 'MaaS Discovery Plugin engine for Foreman '
+description: ! 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
 extensions: []
@@ -129,25 +129,24 @@ 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
+- test/test_plugin_helper.rb
 - test/functional/discovered_hosts_controller_test.rb
-- test/unit/setting_discovered_test.rb
+- test/test_helper.rb
 - test/unit/facts.json
+- test/unit/setting_discovered_test.rb
 - test/unit/host_discovered_test.rb
-- test/test_plugin_helper.rb
-- test/test_helper.rb
-has_rdoc: