cloudkeeper-one 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c702f53ba2245d3a4a786a1a73c052d919dd2a3b
-  data.tar.gz: c93ebf8eab54d5e01fc116e7794fcaa32cc28674
+  metadata.gz: 2addc69f939c5497397accddbf6900526a21e402
+  data.tar.gz: 7f1d72b372c871774198b73320914b76f3b37008
 SHA512:
-  metadata.gz: 80594791bd9a2e17b3ef1b4680388a82511fcb0ff0bc84609044e3128764797441ea9c8780da1f31f2b8d1d9e145abc5de8c74247dae82d977b753d68b70cd5e
-  data.tar.gz: 3720bb3625430abba2a5403d0ecb1f6c61f33ed4a22f65e615d77e282b5ff5fd56d03ef2c5259470902f2702ca0f227a91f43d59acb71876edc5f81ffeb823dd
+  metadata.gz: 4e49c53da9aed9a46713c1cc89195a16c7005424a1cfc4816d12285aca4f59e1290ba8477e01a30a4c50a138315f8de21f5200087b966127d170f6c1e904e19e
+  data.tar.gz: e92811e8d5d75f193b7d896c9ea7f4f04d2f40216b93f7c190d30e3e724da03ad13747f0532702334c0e92572208b2cf12963fbc1ce5a674e681aad2731d5d11

data/config/cloudkeeper-one.yml

@@ -17,6 +17,7 @@ cloudkeeper-one:
       - default
     users: # Handle only images/templates of specified users
     api-call-timeout: 3h # How long will cloudkeeper-one wait for image/template operations to finish in OpenNebula
+    allow-remote-source: true # Allows OpenNebula to directly download remote image
   logging:
     level: ERROR # Logging level
     file: /var/log/cloudkeeper/cloudkeeper-one.log # File to write log to. To turn off file logging leave this field empty.

data/lib/cloudkeeper/one/appliance_actions/utils/image_download.rb

@@ -6,11 +6,11 @@ module Cloudkeeper
       module Utils
         module ImageDownload
           def download_image(uri, username, password)
-            logger.debug "Downloading image from #{uri.inspect} (username: #{username}, password: #{password})"
+            return generate_url uri, username, password if Cloudkeeper::One::Settings[:'opennebula-allow-remote-source']
+
             filename = generate_filename
             retrieve_image URI.parse(uri), username, password, filename
 
-            logger.debug "Image stored into #{filename}"
             filename
           rescue URI::InvalidURIError => ex
             raise Cloudkeeper::One::Errors::NetworkConnectionError, ex
@@ -19,7 +19,9 @@ module Cloudkeeper
           private
 
           def retrieve_image(uri, username, password, filename)
-            Net::HTTP.start(uri.host, uri.port) do |http|
+            logger.debug "Downloading image from #{uri.inspect} (username: #{username}, password: #{password})"
+            use_ssl = uri.scheme == 'https'
+            Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
               request = Net::HTTP::Get.new(uri)
               request.basic_auth username, password
 
@@ -28,14 +30,24 @@ module Cloudkeeper
                 open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
               end
             end
+            logger.debug "Image stored into #{filename}"
           rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,
-                 Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException => ex
+                 Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException, Net::HTTPRetriableError => ex
             raise Cloudkeeper::One::Errors::NetworkConnectionError, ex
           end
 
           def generate_filename
             File.join(Cloudkeeper::One::Settings[:'appliances-tmp-dir'], SecureRandom.uuid)
           end
+
+          def generate_url(uri, username, password)
+            url = URI.parse(uri)
+            url.user = username
+            url.password = password
+
+            logger.debug "Generating remote source URL: #{url.to_s.inspect}"
+            url.to_s
+          end
         end
       end
     end

data/lib/cloudkeeper/one/cli.rb

@@ -92,6 +92,10 @@ module Cloudkeeper
                     default: Cloudkeeper::One::Settings['opennebula']['api-call-timeout'],
                     type: :string,
                     desc: 'How long will cloudkeeper-one wait for image/template operations to finish in OpenNebula'
+      method_option :'opennebula-allow-remote-source',
+                    default: Cloudkeeper::One::Settings['opennebula']['allow-remote-source'],
+                    type: :boolean,
+                    desc: 'Allows OpenNebula to directly download remote image'
 
       desc 'sync', 'Runs synchronization process'
       def sync
@@ -125,7 +129,7 @@ module Cloudkeeper
 
       def validate_configuration!
         validate_configuration_group! :authentication,
-                                      %i(certificate key core-certificate),
+                                      %i[certificate key core-certificate],
                                       'Authentication configuration missing'
       end
 

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper-one
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler