smart_proxy_discovery_image 1.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7c6b10c6097546c69107e77831b8caacc340ab8
-  data.tar.gz: 131af61792cc724729b7294b016dc70e4a28216c
+SHA256:
+  metadata.gz: 01103d93b909fdfc22ba01c37dd7061affb9d0440e35e041c3333c2884edaf37
+  data.tar.gz: b827937012ce424a99fe4c0f1d3bb756f996971a8c496d46bbfdcf69a1deb6b2
 SHA512:
-  metadata.gz: c843b688ac17c86d4785ebef7a5bf635ee3bc1d133ead77413f56d9d65613db57c3d2c52efc3f65ce0399606e68e084bcfa00d9cceae919929e626baf6e18812
-  data.tar.gz: c0e132e164d1ae53655e083f09a8d52520a0dbdebc7dd0f663f8f0abe9e98e70caa19c3ce531545caa5a61c977ceacca3e13b53266f5912e03a57f4d358cabb1
+  metadata.gz: e30242f64d5d36ab550a2ded89f3d700a4ce324d296e4243486389c2319a9d30a8c81b1830f50e285b7894609d15de8edaf554d4e5108d39103b8eb01fe1874b
+  data.tar.gz: 4e2298339d4802460eb7f3f0fa08698bf76a034860d0944039aa690dad062c703d10cf4a4fdd60eed8242ceb9104ec011e0f1684d7c302a2acdfa179b373985f

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -7,42 +7,53 @@ 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
-
-      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!"
+      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
-
-      run_after_response 2, kexec, "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz"
+      run_after_response data, 2, kexec, "--debug", "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
       { :result => true }.to_json
     end
 
 
     # 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"
+    def run_after_response(data, seconds, *command)
       Thread.start do
         begin
-          sleep seconds
-          logger.debug "BMC shell executing: #{command.inspect}"
-          if (sudo = which('sudo'))
-            status = system(sudo, *command)
-          else
-            logger.warn "sudo binary was not found"
+          # download kernel and initramdisk
+          logger.debug "Downloading: #{data['kernel']}"
+          vmlinuz_thread = ::Proxy::HttpDownload.new(data['kernel'], '/tmp/vmlinuz').start
+          logger.error("vmlinuz is still downloading, ignored") unless vmlinuz_thread
+          logger.error("cannot download vmlinuz for kexec") unless vmlinuz_thread.join == 0
+          logger.debug "Downloading: #{data['initram']}"
+          initrd_thread = ::Proxy::HttpDownload.new(data['initram'], '/tmp/initrd.img').start
+          logger.error("initrd.img is still downloading, ignored") unless initrd_thread
+          logger.error("cannot download initrd.img for kexec") unless initrd_thread.join == 0
+          # wait few seconds just in case the download was fast and perform kexec
+          # only perform kexec when both locks were available to prevent subsequent request while downloading
+          if vmlinuz_thread && initrd_thread
+            logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
+            sleep seconds
+            logger.debug "Power API executing: #{command.inspect}"
+            if (sudo = which('sudo'))
+              status = system(sudo, *command)
+            else
+              logger.warn "sudo binary was not found"
+            end
           end
           # only report errors
           logger.warn "The attempted command failed with code #{$?.exitstatus}" unless status

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.5'
+    VERSION = '1.2.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.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -19,20 +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: []
@@ -40,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: