vagrant-subutai 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dcd1dde2de9a5a1d82686230743ce83bd9a4d41
-  data.tar.gz: 20d0f8c8072d0bd5a18134066092ed1fe3597c62
+  metadata.gz: d47cbe837d15ae03bd88d70203fa6aa1e3e61b94
+  data.tar.gz: f707359708e7752f4798aa4067540ea7c5c72d15
 SHA512:
-  metadata.gz: 8447c74b8d66642b3b86974c487808c380b34b86ef981b669463148e5ef2c7763a411271707b4dc5e16a01882cb2e7d9efd3f0973863878de5870a939ed105c6
-  data.tar.gz: 9b714bd82b364da1ce2f46d47a2aed4710700e8f3851e813705e56238741f8c656dfef508e9185e446767e6bf05f20b483541dd26d10d054528b70fe417641b4
+  metadata.gz: 408eb1554b9bcd6281a0b061c5e466196e7f567a472e5f23052b6ac434ce991ae976ceb1d70041347586532221a243c44fe3ad119b61234693f6d2bc679ff9cf
+  data.tar.gz: d009a2052b2c5c46b1ae5f6c7aa4982243d47371510bacb8e40bc95fbd05759f8a5e8158d2db25b12722c67afdbcea1e690ec75b72aaaad2c46e771262e0230d

data/CHANGELOG.md

@@ -41,5 +41,14 @@ FEATURES:
  
 ## 1.1.6 (April 2, 2018)
 
- BUG FIXES:
-   - User configuration values case sensitive fixed 
+BUG FIXES:
+  - User configuration values case sensitive fixed 
+   
+## 1.1.7 (April 7, 2018) 
+  
+BUG FIXES:
+  - null port forward value fixed   
+
+FEATURES:
+  - User configuration new keys added (LIBVIRT_USER, LIBVIRT_HOST, LIBVIRT_PORT, LIBVIRT_MACVTAP, LIBVIRT_NO_BRIDGE)   
+     

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

@@ -47,6 +47,11 @@ module SubutaiConfig
     BAZAAR_EMAIL
     BAZAAR_PASSWORD
     SUBUTAI_DISK_PATH
+    LIBVIRT_USER
+    LIBVIRT_HOST
+    LIBVIRT_PORT
+    LIBVIRT_MACVTAP
+    LIBVIRT_NO_BRIDGE
   ].freeze
   
   GENERATED_PARAMETERS = %i[
@@ -87,6 +92,8 @@ module SubutaiConfig
     SUBUTAI_NAME: 'My Peer',         # PeerOS name
     SUBUTAI_SCOPE: 'Public',         # PeerOS scope
     SUBUTAI_USERNAME: 'admin',       # PeerOS default username
+    LIBVIRT_PORT: 22,                # Libvirt kvm remote operation ssh port
+    LIBVIRT_MACVTAP: false,          # Libvirt macvtap interface
 
     # Configuration parameters below have not been implemented
     SUBUTAI_SNAP: nil,               # alternative snap to provision
@@ -312,7 +319,7 @@ module SubutaiConfig
   def self.do_network(provider)
     # set the next available console port if provisioning a peer in nat mode
     put(:_CONSOLE_PORT, find_port(get(:DESIRED_CONSOLE_PORT)), true) \
-      if boolean?(:SUBUTAI_PEER) && get(:_CONSOLE_PORT).nil? && write?
+      if boolean?(:SUBUTAI_PEER) && get(:_CONSOLE_PORT).nil? && (write? || delete?)
 
     # set the SSH port if we are using bridged mode
     put(:_SSH_PORT, find_port(get(:DESIRED_SSH_PORT)), true) \
@@ -336,11 +343,6 @@ module SubutaiConfig
 
     # Load overrides from the environment, and generated configurations
     ENV.each do |key, value|
-      if value == 'true'
-        value = true
-      elsif value == 'false'
-        value = false
-      end
       put(key.to_sym, value, false) if USER_PARAMETERS.include? key.to_sym
     end
     do_handlers
@@ -402,30 +404,34 @@ module SubutaiConfig
   end
 
   def self.get_latest_id_artifact(owner, artifact_name)
-    begin
-      url = url_of_cdn + '/raw/info?owner=' + owner + '&name=' + artifact_name
-      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']
-        when Net::HTTPNotFound
-          Put.error "#{response.body} template name #{name}, owner #{owner}"
+    if write?
+      begin
+        url = url_of_cdn + '/raw/info?owner=' + owner + '&name=' + artifact_name
+        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']
+          when Net::HTTPNotFound
+            Put.error "#{response.body} template name #{name}, owner #{owner}"
+        end
+      rescue Errno::ECONNREFUSED
+        Put.error "cdn.subutai.io:8338 connection refused"
+      rescue Errno::EHOSTUNREACH
+        Put.error "cdn.subutai.io:8338 unreachable"
+      rescue => e
+        Put.error e
       end
-    rescue Errno::ECONNREFUSED
-      Put.error "cdn.subutai.io:8338 connection refused"
-    rescue Errno::EHOSTUNREACH
-      Put.error "cdn.subutai.io:8338 unreachable"
-    rescue => e
-      Put.error e
+    else
+      ""  # send empty id. DON'T REMOVE
     end
   end
 end

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

@@ -32,7 +32,7 @@ PROVIDER_MAC_PREFIXES = {
     :virtualbox       => '080027',
     :libvirt          => '525400',
     :vmware_fusion    => '______',
-    :vmware           => '______',
+    :vmware           => '005056',
     :parallels        => '______',
     :hyper_v          => '______'
 }
@@ -127,8 +127,8 @@ def random_mac_addr(provider)
       # PROVIDER_MAC_PREFIXES[:vmware_fusion] + 3.times.map { '%02x' % rand(0..255) }.join
       raise "Unsupported provider #{provider}"
     when :vmware
-      # PROVIDER_MAC_PREFIXES[:vmware] + 3.times.map { '%02x' % rand(0..255) }.join
-      raise "Unsupported provider #{provider}"
+      PROVIDER_MAC_PREFIXES[:vmware] + 3.times.map { '%02x' % rand(0..255) }.join
+      #raise "Unsupported provider #{provider}"
     when :parallels
       # PROVIDER_MAC_PREFIXES[:parallels] + 3.times.map { '%02x' % rand(0..255) }.join
       raise "Unsupported provider #{provider}"

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-subutai
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Subutai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler