vagrant-subutai 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85530987aa29ed8ea34ba2f14f62b0f353610b7
-  data.tar.gz: e0052e2f1e16a49dacca29f63c93a257011a4bc4
+  metadata.gz: dbe4e42e53dfee5ad7d45eaf9aa495c2c69012e6
+  data.tar.gz: 8e01599337060878df7157e6f83ba695d43b5405
 SHA512:
-  metadata.gz: 6eb58cb2f067c894be6d8746bffcefd2c74ee8113587e39e0763be00db480e1cd9a5393c6fb86fb9d27f7178f62e8d6ad4fb724ea6f35921245a39577a023801
-  data.tar.gz: 84a85a6eddceed3ccb77df4577604e95159ff2504432b227eba8f7f39c0f72bfbeb527927e2932dc136c2d1c459469ab1e3ee2a537b5c946c77c2735116aaa63
+  metadata.gz: 164937201e9c9878ff768e72ec1216e6bf9e6b73ea6e77cf843aa3a22ad3bdc15eb0a8735a6c6c1633ddc0261b99b5ded675eeb59fbbde16b81ff44c14423eac
+  data.tar.gz: 6a219a6ab58ef9b22cd177574adfbcf380f2c0e6d2882d5cdf8cf7a434ffddf851f5135a3591b37421cd328bf28ad9a4b78484f2824291026ccad367fc5095e4

data/CHANGELOG.md

@@ -27,3 +27,9 @@ BUG FIXES:
 FEATURES:
 
   - VM Disk Path variable added to conf file (SUBUTAI_DISK_PATH)
+
+## 1.1.4 (March 30, 2018)
+
+FEATURES: 
+  - Libvirt disk size function added
+  - Cdn verfify certificate removed

data/lib/vagrant-subutai/packer/subutai_config.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'digest'
-require 'net/http'
+require 'net/https'
+require 'uri'
 require 'json'
 
 require_relative 'subutai_net'
@@ -385,13 +386,26 @@ module SubutaiConfig
   # TODO remove Openssl verify (if certificate expired in cdn this code will be crashed)
   def self.get_latest_id_artifact(owner, artifact_name)
     url = url_of_cdn + '/raw/info?owner=' + owner + '&name=' + artifact_name
-    uri = URI(url)
-    response = Net::HTTP.get(uri)
-    result = JSON.parse(response)
-    result[0]['id']
+    uri = URI.parse(url)
+    https = Net::HTTP.new(uri.host, uri.port)
+    https.use_ssl = true
+    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    https.read_timeout = 3600 # an hour
+
+    request = Net::HTTP::Get.new(uri.request_uri)
+    response = https.request(request)
+
+    case response
+      when Net::HTTPOK
+        response = JSON.parse(response.body)
+        response[0]['id']
+      else
+        Put.error "Try again! #{response.body} template name #{name}, owner #{owner}"
+    end
   end
 end
 
 at_exit do
   SubutaiConfig.cleanup unless SubutaiConfig.cmd.nil?
 end
+

data/lib/vagrant-subutai/packer/subutai_disk.rb

@@ -2,8 +2,8 @@ require_relative 'subutai_config'
 
 # For managing VM disks
 module SubutaiDisk
-  DISK_NAME = "SubutaiDisk"
-  DISK_FORMAT = "vdi"
+  DISK_NAME = "SubutaiDisk".freeze
+  DISK_FORMAT = "vdi".freeze
 
   # Checks disk size for adding new VM disks
   def self.has_grow
@@ -34,6 +34,11 @@ module SubutaiDisk
     grow_by.to_i * 1024 + 2 * 1024 # 2 gb for overhead, unit in megabytes
   end
 
+  def self.libvirt_size(grow_by)
+    size = grow_by.to_i + 2   # 2 gb for overhead, unit in gb
+    "#{size}G"
+  end
+
   # Save disk size and port to generated.yml
   def self.save_conf(grow_by)
     SubutaiConfig.put(:_DISK_PORT, port, true)
@@ -69,4 +74,18 @@ module SubutaiDisk
       end
     end
   end
+
+  def self.path
+    if File.directory?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
+      # check permission
+      if File.writable?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
+        File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
+      else
+        Put.warn "No write permission: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
+        nil
+      end
+    else
+      nil
+    end
+  end
 end

data/lib/vagrant-subutai/rest/gorjun.rb

@@ -10,6 +10,8 @@ module VagrantSubutai
         uri = URI.parse("#{url}?name=#{name}&owner=#{owner}")
         https = Net::HTTP.new(uri.host, uri.port)
         https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 3600 # an hour
 
         request = Net::HTTP::Get.new(uri.request_uri)
         response = https.request(request)
@@ -37,4 +39,4 @@ module VagrantSubutai
       end
     end
   end
-end
+end

data/lib/vagrant-subutai/subutai_commands.rb

@@ -136,8 +136,8 @@ module VagrantSubutai
         peer_id = Rest::SubutaiConsole.fingerprint(url)
         ip = info('ipaddr')
 
-        Put.info ip
-        Put.info peer_id
+        STDOUT.puts ip
+        STDOUT.puts peer_id
       rescue Net::OpenTimeout => e
         Put.error e
       rescue => e

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-subutai
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Subutai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler