vagrant-subutai 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6eb73b6420f3706a1cb5a525a7bbc9c7c8d2172
-  data.tar.gz: e8d087dbc65c5268fc8d796f18bf685d9f527adc
+  metadata.gz: 467222653b28e1075f3be05f29f5c776ebbc94c3
+  data.tar.gz: c4f0d411f13d3966fe3c3767f407a5da49f5e396
 SHA512:
-  metadata.gz: 1188edc48a875437c0c0f82b92ece3f66e6cd55f8401d76f9c4228f8041a507e42f17f9ffb7db68e6816abc36e76af13e725a2ea6597595eb5efb5fa19ddf152
-  data.tar.gz: 95fbb84d529ae8b01b6ede8c7ddee1f99e72859cd0a43e1723c1a678d768f893ba39cbf0f9b542fc922ceffe48ab4fce341a820f7011e6fe92544b4899ad0994
+  metadata.gz: c1d8525a0ddd562de79aeeced18d0e36e0be384babd1bf62e6b75a73815ca301e8241b578ab7dce0dda74499bb57fd11e96e2134a25f26daabc1b7e59d7c2a8c
+  data.tar.gz: e3f6a4d91dffa70e84bbc0bdedaa78d36dbd8c258a2b9fa30bc29809aec60f7315c6ea000126bc46a1fb9b065515dfd985f0bc65ffbe1540e7ba93ec9dbed650

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 7.0.7 (November 07, 2018)
+
+BUG FIXES:
+  - [Parallels] Fixed bug with disability of creating virtual disk. #135
+  - Fixed bug with white space in home directory path results in VM storage growth script failures. #129
+
+FEATURES:  
+  - [configuration] Implemented LIBVIRT_POOL configuration parameter. #127
+  - [configuration] Implemented APT_PROXY_URL configuration parameter
+
 ## 7.0.6 (October 17, 2018)
 
 BUG FIXES:

data/lib/vagrant-subutai/create_disk.rb

@@ -1,4 +1,5 @@
 require_relative '../vagrant-subutai'
+require 'pathname'
 
 
 module VagrantSubutai
@@ -38,19 +39,43 @@ module VagrantSubutai
     # and any shared folders or networks are already setup.
     #
     # No return value is expected.
-    def provision
+    # Create virtual disk for hyperv
+    def hyperv
       has_grow, grow_by = SubutaiDisk.has_grow
       file_disk = SubutaiDisk.file_path(grow_by, "hyper_v")
+      disk_path = Pathname.new file_disk
 
-      unless File.exist?(file_disk)
+      unless disk_path.exist?
         Put.warn SubutaiDisk.message(grow_by)
 
         if has_grow
-          if SubutaiDisk.hyperv_create_disk(grow_by, file_disk)
-            SubutaiDisk.save_path(SubutaiDisk.port, file_disk)
+          if SubutaiDisk.hyperv_create_disk(grow_by, disk_path.to_s)
+            SubutaiDisk.save_path(SubutaiDisk.port, disk_path.to_s)
             SubutaiDisk.save_conf(grow_by)
           end
         end
+      else
+        Put.error "Disk file already exist in #{file_disk}"
+      end
+    end
+
+    # Create virtual disk for parallels
+    def parallels
+      has_grow, grow_by = SubutaiDisk.has_grow
+      
+      if has_grow
+        if SubutaiDisk.parallels_create_disk(grow_by)
+          Put.warn SubutaiDisk.message(grow_by)
+          SubutaiDisk.save_conf(grow_by)
+        end
+      end
+    end
+
+    def provision
+      if SubutaiConfig.provider == :hyper_v
+        hyperv
+      elsif SubutaiConfig.provider == :parallels
+        parallels
       end
     end
 

data/lib/vagrant-subutai/packer/script/create_disk_and_attach.ps1

@@ -1,17 +1,18 @@
 param (
     [string]$VmId = $(throw "-VmId is required."),
-    [string]$DiskPath = $(throw "-DiskPath is required."),
+    [System.IO.DirectoryInfo]$DiskPath = $(throw "-DiskPath is required."),
     [Int32]$DiskSize = $(throw "-DiskSize is required.")
 )
 
 try {
     $vm = Get-VM -Id $VmId -ErrorAction "stop"
+    Write-Output $DiskPath.FullName
 
     # create new disk
     # converting GB to Byte
-    NEW-VHD -Dynamic $DiskPath -SizeBytes $($DiskSize*1073741824)
+    NEW-VHD -Dynamic $DiskPath.FullName -SizeBytes $($DiskSize*1073741824)
     # attach new disk to VM
-    ADD-VMHardDiskDrive -vmname $vm.Name -path $DiskPath -ControllerType SCSI
+    ADD-VMHardDiskDrive -vmname $vm.Name -path $DiskPath.FullName -ControllerType SCSI
 }
 catch {
     Write-Error-Message "Failed to create disk or attach to VM "

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

@@ -35,6 +35,7 @@ module SubutaiConfig
     SUBUTAI_MAN_TMPL
     APT_PROXY_URL
     PROVISION
+    BLUEPRINT_NO_AUTO
     BRIDGE
     AUTHORIZED_KEYS
     PASSWORD_OVERRIDE
@@ -47,6 +48,7 @@ module SubutaiConfig
     USER_VARIABLES
     BAZAAR_EMAIL
     BAZAAR_PASSWORD
+    BAZAAR_NO_AUTO
     SUBUTAI_DISK_PATH
     LIBVIRT_USER
     LIBVIRT_HOST
@@ -54,7 +56,6 @@ module SubutaiConfig
     LIBVIRT_MACVTAP
     LIBVIRT_NO_BRIDGE
     LIBVIRT_POOL
-    BAZAAR_NO_AUTO
     SUBUTAI_DISK
     BRIDGE_VIRTUALBOX
     BRIDGE_PARALLELS
@@ -108,6 +109,7 @@ module SubutaiConfig
     BAZAAR_NO_AUTO: false,           # PeerOs automatic registration to Bazaar (turn on(false), turn off(true))
     PROVISION: true,                 # to provision or not to
     LIBVIRT_POOL: 'default',         # Libvirt pool name
+    BLUEPRINT_NO_AUTO: false,        # Auto provision blueprints if present
 
     # Configuration parameters below have not been implemented
     SUBUTAI_DESKTOP: false,          # install desktop with tray and p2p client
@@ -366,11 +368,16 @@ module SubutaiConfig
   end
 
   def self.machine_id(provider)
+    id = nil
+
     case provider
     when :hyper_v
-      id = PARENT_DIR+'/machines/default/hyperv/id'
-      File.read(id) if File.exist?(id)
+      id = File.join(PARENT_DIR, 'machines/default/hyperv/id')
+    when :parallels
+      id = File.join(PARENT_DIR, 'machines/default/parallels/id')
     end
+
+    File.read(id) if File.exist?(id)
   end
 
   # Loads the generated and user configuration from YAML files

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

@@ -1,5 +1,6 @@
 require_relative 'subutai_config'
 require_relative '../../../lib/vagrant-subutai/util/powershell'
+require_relative '../../../lib/vagrant-subutai/util/terminal'
 
 # For managing VM disks
 module SubutaiDisk
@@ -89,7 +90,19 @@ module SubutaiDisk
       Put.error("[FAILED] Disk Creation. Not found machine id")
       false
     else
-      VagrantSubutai::Util::Powershell.execute(script, "-VmId", id, "-DiskPath", file_disk, "-DiskSize", "#{vmware_size(grow_by)}")
+      VagrantSubutai::Util::Powershell.execute(script, "-VmId", id, "-DiskPath", "'#{file_disk}'", "-DiskSize", "#{vmware_size(grow_by)}")
+    end
+  end
+
+  def self.parallels_create_disk(grow_by)
+    id = SubutaiConfig.machine_id(:parallels)
+
+    if id.nil?
+      Put.error("[FAILED] Disk Creation. Not found machine id")
+      false
+    else
+      # prlctl set ec45bf0c-1d1e-44c0-b5b8-6d80623b8364 --device-add=hdd --size=4092 # in megabytes
+      VagrantSubutai::Util::Terminal.execute_cmd("prlctl", "set", id, "--device-add=hdd", "--size=#{SubutaiDisk.size(grow_by)}")
     end
   end
 
@@ -120,7 +133,7 @@ module SubutaiDisk
   end
 
   def self.message(grow_by)
-    "==> default: Disk size configured to #{SubutaiConfig.get(:DISK_SIZE)}GB, increasing 100GB default by #{grow_by}GB."
+    "==> default: Disk size configured to #{SubutaiConfig.get(:DISK_SIZE)}GB, increasing #{SubutaiConfig.get(:DISK_SIZE) - grow_by}GB default by #{grow_by}GB."
   end
 
   # Gives disk file name

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

@@ -29,6 +29,8 @@ module SubutaiValidation
     "USER_VARIABLES":       :json_object,
     "BAZAAR_EMAIL":         :string,
     "BAZAAR_PASSWORD":      :string,
+    "BAZAAR_NO_AUTO":       :bool,
+    "BLUEPRINT_NO_AUTO":    :bool,
     "SUBUTAI_DISK_PATH":    :path,
     "LIBVIRT_USER":         :string,
     "LIBVIRT_HOST":         :string,
@@ -36,7 +38,6 @@ module SubutaiValidation
     "LIBVIRT_PORT":         :int,
     "LIBVIRT_MACVTAP":      :bool,
     "LIBVIRT_NO_BRIDGE":    :bool,
-    "BAZAAR_NO_AUTO":       :bool,
     "BRIDGE_VIRTUALBOX":    :string,
     "BRIDGE_PARALLELS":     :string,
     "BRIDGE_VMWARE":        :string,

data/lib/vagrant-subutai/provisioner.rb

@@ -39,18 +39,20 @@ module VagrantSubutai
     #
     # No return value is expected.
     def provision
-      # If Subutai.json exist
-      if File.exist?("#{Dir.pwd}/#{Configs::Blueprint::FILE_NAME}")
-        subutai_cli = Commands.new(ARGV, @machine.env)
-        ip = subutai_cli.info(Configs::VagrantCommand::ARG_IP_ADDR)
-
-        if ip.nil?
-          STDOUT.puts 'We can\'t detect your PeerOS ip address!'
-          exit
-        end
-        url = "https://#{ip}:#{Configs::SubutaiConsoleAPI::PORT}"
+      unless SubutaiConfig.get(:BLUEPRINT_NO_AUTO)
+        # If Subutai.json exist
+        if File.exist?(File.join(Dir.pwd, Configs::Blueprint::FILE_NAME))
+          subutai_cli = Commands.new(ARGV, @machine.env)
+          ip = subutai_cli.info(Configs::VagrantCommand::ARG_IP_ADDR)
+
+          if ip.nil?
+            STDOUT.puts 'We can\'t detect your PeerOS ip address!'
+            exit
+          end
+          url = "https://#{ip}:#{Configs::SubutaiConsoleAPI::PORT}"
 
-        subutai_cli.blueprint(url, 1)
+          subutai_cli.blueprint(url, 1)
+        end
       end
     end
 

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '7.0.6'
+  VERSION = '7.0.7'
 end

metadata

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