smart_proxy_discovery_image 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9cc8032e81068991f7892a103cfc512f76cdfff
-  data.tar.gz: 74eee65dc8349bf8aaf527cf88f5d6c6ae1f19a3
+  metadata.gz: e7c6b10c6097546c69107e77831b8caacc340ab8
+  data.tar.gz: 131af61792cc724729b7294b016dc70e4a28216c
 SHA512:
-  metadata.gz: 94610057ed09b8a37d57d4b5813adc75a6a3e5f06c082a87efece5920897d79906e2480c6c5c51da3e6f2a4f6bf10835e4f9e5abe751b46e6b9383cde664dd86
-  data.tar.gz: ba058eef91e4e2216ccf6e3ba7a4dfde159a7887f1f613f14f6bd10a30309cb17f194c525dcf3cbc60f76a4e92c14dc7ada0f933717679fda950fd09385fe752
+  metadata.gz: c843b688ac17c86d4785ebef7a5bf635ee3bc1d133ead77413f56d9d65613db57c3d2c52efc3f65ce0399606e68e084bcfa00d9cceae919929e626baf6e18812
+  data.tar.gz: c0e132e164d1ae53655e083f09a8d52520a0dbdebc7dd0f663f8f0abe9e98e70caa19c3ce531545caa5a61c977ceacca3e13b53266f5912e03a57f4d358cabb1

data/lib/smart_proxy_discovery_image/http_config.ru

@@ -1,5 +1,10 @@
 require 'smart_proxy_discovery_image/power_api'
+require 'smart_proxy_discovery_image/inventory_api'
 
 map "/power" do
   run Proxy::DiscoveryImage::PowerApi
 end
+
+map "/inventory" do
+  run Proxy::DiscoveryImage::InventoryApi
+end

data/lib/smart_proxy_discovery_image/inventory_api.rb

@@ -0,0 +1,13 @@
+class Proxy::DiscoveryImage::InventoryApi < Sinatra::Base
+  helpers ::Proxy::Helpers
+
+  get "/facter" do
+    begin
+      content_type :json
+      Facter.clear
+      Facter.to_hash.to_json
+    rescue => e
+      log_halt 400, e
+    end
+  end
+end

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -17,12 +17,14 @@ module Proxy::DiscoveryImage
       log_halt 500, "kexec binary was not found" unless (kexec = which('kexec'))
       data = JSON.parse request.body.read
 
-      # download kernel and image synchronously (can be improved: http://projects.theforeman.org/issues/11318)
-      wget = "#{which("wget")} --timeout=10 --tries=3 --no-check-certificate -qc "
-      status = system("#{wget} '#{escape_for_shell(data['kernel'])}' -O /tmp/vmlinuz")
-      log_halt 500, "Cannot download kernel: #{$?.exitstatus}" unless status
-      status = system("#{wget} '#{escape_for_shell(data['initram'])}' -O /tmp/initrd.img")
-      log_halt 500, "Cannot download kernel: #{$?.exitstatus}" unless status
+      logger.debug "Downloading: #{data['kernel']}"
+      if ::Proxy::HttpDownload.new(data['kernel'], '/tmp/vmlinuz').start.join != 0
+        log_halt 500, "cannot download kernel for kexec!"
+      end
+      logger.debug "Downloading: #{data['initram']}"
+      if ::Proxy::HttpDownload.new(data['initram'], '/tmp/initrd.img').start.join != 0
+        log_halt 500, "cannot download initram for kexec!"
+      end
 
       run_after_response 2, kexec, "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz"
       { :result => true }.to_json

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -19,6 +19,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/smart_proxy_discovery_image/inventory_api.rb
 - lib/smart_proxy_discovery_image/plugin.rb
 - lib/smart_proxy_discovery_image/power_api.rb
 - lib/smart_proxy_discovery_image/http_config.ru