smart_proxy_discovery_image 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c9cc8032e81068991f7892a103cfc512f76cdfff
-  data.tar.gz: 74eee65dc8349bf8aaf527cf88f5d6c6ae1f19a3
+SHA256:
+  metadata.gz: 33b1e050b42bfdaa738931d647c63a8a57ba82d264770fe3713a377ee8d26761
+  data.tar.gz: 3c7f7b8d0ec6a82eff559184537c1d207fd317d0e83ea4e91f86cac2100758b2
 SHA512:
-  metadata.gz: 94610057ed09b8a37d57d4b5813adc75a6a3e5f06c082a87efece5920897d79906e2480c6c5c51da3e6f2a4f6bf10835e4f9e5abe751b46e6b9383cde664dd86
-  data.tar.gz: ba058eef91e4e2216ccf6e3ba7a4dfde159a7887f1f613f14f6bd10a30309cb17f194c525dcf3cbc60f76a4e92c14dc7ada0f933717679fda950fd09385fe752
+  metadata.gz: 79c394795be0c33935ef82f2396f77fefe8158a151501235544ae5ec6781cb7b31431477e1daa96ede830e8a8dd7a3deed9375b17a44b0c8c7336bfc683ea60c
+  data.tar.gz: c11681c80e5381cc7a0494497dd9e19337b768b404cd47395f77e81503e38ec4d527ddafe6c7d68dc8881fa1da2079dc35485cc84408bd7f847050a087ae3de3

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

@@ -7,24 +7,32 @@ module Proxy::DiscoveryImage
     include Proxy::Util
 
     put "/reboot" do
-      log_halt 500, "shutdown binary was not found" unless (shutdown = which('shutdown'))
-      run_after_response 5, shutdown, "-r", "now", "Foreman BMC API reboot"
+      log_halt(500, "shutdown binary was not found") unless (shutdown = which('shutdown'))
+      run_after_response 5, shutdown, "-r", "now", "Foreman Power API reboot"
       content_type :json
       { :result => true }.to_json
     end
 
     put "/kexec" do
-      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
-
-      run_after_response 2, kexec, "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz"
+      body_data = request.body.read
+      # change virtual terminal out of newt screen
+      system("chvt", "2")
+      logger.debug "Initiated kexec provisioning with #{body_data}"
+      log_halt(500, "kexec binary was not found") unless (kexec = which('kexec'))
+      begin
+        data = JSON.parse body_data
+      rescue JSON::ParserError
+        log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
+      end
+      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, "--debug", "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
       { :result => true }.to_json
     end
 
@@ -32,11 +40,11 @@ module Proxy::DiscoveryImage
     # Execute command in a separate thread after 5 seconds to give the server some
     # time to finish the request. Does *not* execute via a shell.
     def run_after_response(seconds, *command)
-      logger.debug "BMC shell execution scheduled in #{seconds} seconds"
+      logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
       Thread.start do
         begin
           sleep seconds
-          logger.debug "BMC shell executing: #{command.inspect}"
+          logger.debug "Power API executing: #{command.inspect}"
           if (sudo = which('sudo'))
             status = system(sudo, *command)
           else

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.4'
+    VERSION = '1.1.0'
   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.1.0
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -19,19 +19,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- LICENSE
+- README.md
+- bundler.d/discovery_image.rb
+- lib/smart_proxy_discovery_image.rb
+- lib/smart_proxy_discovery_image/http_config.ru
+- 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
 - lib/smart_proxy_discovery_image/version.rb
-- lib/smart_proxy_discovery_image.rb
-- bundler.d/discovery_image.rb
 - settings.d/discovery_image.yml.example
-- Gemfile
-- LICENSE
-- README.md
-homepage: http://github.com/theforeman/smart_proxy_discovery_image
+homepage: https://github.com/theforeman/smart_proxy_discovery_image
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -39,19 +40,17 @@ 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'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: FDI API for Foreman Smart-Proxy
 test_files: []
-has_rdoc: