vagrant-persistent-storage 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2cd9542dcdbeff5e8fdf87e09ca085eb9799a4
-  data.tar.gz: 486f6ab13569d5584c7779af88a95dd31a523371
+  metadata.gz: f1753a327642759189697913b1a53f035d39cec9
+  data.tar.gz: dc5f41fd225674a0e8b676fe57f60f21eabb0dc0
 SHA512:
-  metadata.gz: 376dda5728447b239867930cae0d89c604b6986e03d568d3fe0a6d788b4ee2c2e0ec4434805fe3def541f2c92bb106b284635f43fa435c67ffc1c729d7140181
-  data.tar.gz: ed915a2d2d88c66aa61d8de446243a88f5ec8072df8f84757ec836b27bc5e3af81a8ae502a8db09819db45c2276a1162ef37f16b7bae1704151db1128702c262
+  metadata.gz: ae461e26b183879b7c37289494c56f6b065346a3698da310ed3de76b767d4015328a16fa14378639978c3bb1c2ac72fb4ce556513d69a13d0ebeb6d0d31d3e48
+  data.tar.gz: a1b126e45bbd13065ce7779c1e70923ad1edaf5808d0d05db14f988fd0c724e663856f91512b641ff5ecc7bd3c9fb2da2f9353bff1aac01cab648ce8ecda6788

data/README.md

@@ -42,6 +42,17 @@ The disk is initialized and added to it's own volume group as specfied in the co
 this defaults to 'vagrant'. An ext4 filesystem is created and the disk mounted appropriately,
 with entries added to fstab ... subsequent runs will mount this disk with the options specified
 
+## Windows Guests
+
+Windows Guests must use the WinRM communicator by setting `vm.communicator = 'winrm'`.  An additional option is provided to 
+allow you to set the drive letter using:
+
+```
+config.persistent_storage.drive_letter = 'Z'
+```
+
+Options that are irrelevent to Windows are ignored, such as `mountname`, `filesystem`, `mountpoint` and `volgroupname`.
+
 ## Troubleshooting
 
 If your box are not using LVM you must set `config.persistent_storage.use_lvm = false`.
@@ -59,6 +70,7 @@ If your box are not using LVM you must set `config.persistent_storage.use_lvm =
 * [Ciprian Zaharie](https://github.com/bucatzel)
 * [aishahalim](https://github.com/aishahalim)
 * [Dick Tang](https://github.com/dictcp)
+* [dsmaher](https://github.com/dsmaher)
 
 ## TODO
 

data/lib/vagrant-persistent-storage/config.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
       attr_accessor :diskdevice
       attr_accessor :filesystem
       attr_accessor :volgroupname
+	  attr_accessor :drive_letter
 
       alias_method :create?, :create
       alias_method :mount?, :mount
@@ -41,6 +42,7 @@ module VagrantPlugins
         @diskdevice = UNSET_VALUE
         @filesystem = UNSET_VALUE
         @volgroupname = UNSET_VALUE
+		@drive_letter = UNSET_VALUE
       end
 
       def finalize!
@@ -58,6 +60,7 @@ module VagrantPlugins
         @diskdevice = 0 if @diskdevice == UNSET_VALUE
         @filesystem = 0 if @filesystem == UNSET_VALUE
         @volgroupname = 0 if @volgroupname == UNSET_VALUE
+		@drive_letter = 0 if @drive_letter == UNSET_VALUE
       end
 
       def validate(machine)
@@ -113,7 +116,7 @@ module VagrantPlugins
             :is_class   => volgroupname.class.to_s,
           })
         end
-        
+
         mount_point_path = Pathname.new("#{machine.config.persistent_storage.location}")
         if ! mount_point_path.absolute?
           errors << I18n.t('vagrant_persistent_storage.config.not_a_path', {

data/lib/vagrant-persistent-storage/manage_storage.rb

@@ -5,7 +5,6 @@ require 'erb'
 module VagrantPlugins
   module PersistentStorage
     module ManageStorage
-
       def populate_template(m)
         mnt_name = m.config.persistent_storage.mountname
         mnt_point = m.config.persistent_storage.mountpoint
@@ -18,6 +17,15 @@ module VagrantPlugins
         mount = m.config.persistent_storage.mount
         format = m.config.persistent_storage.format
 
+		## windows filesystem options
+		drive_letter = m.config.persistent_storage.drive_letter
+
+		if m.config.vm.communicator == :winrm
+			os = "windows"
+		else
+			os = "linux"
+		end
+
         vg_name = 'vps' unless vg_name != 0
         disk_dev = '/dev/sdb' unless disk_dev != 0
         mnt_name = 'vps' unless mnt_name != 0
@@ -28,8 +36,25 @@ module VagrantPlugins
         else
           device = "#{disk_dev}1"
         end
-        
-        ## shell script to format disk, create/manage LVM, mount disk
+		if drive_letter == 0
+			drive_letter = ""
+		else
+			drive_letter = "letter=#{drive_letter}"
+		end
+		
+		if os == "windows"
+			## shell script for windows to create NTFS partition and assign drive letter
+			disk_operations_template = ERB.new <<-EOF
+			<% if format == true %>
+			foreach ($disk in get-wmiobject Win32_DiskDrive -Filter "Partitions = 0"){
+				$disk.DeviceID
+				$disk.Index
+				"select disk "+$disk.Index+"`r clean`r create partition primary`r format fs=ntfs unit=65536 quick`r active`r assign #{drive_letter}" | diskpart >> disk_operation_log.txt
+			}
+			<% end %>
+			EOF
+		else
+		## shell script to format disk, create/manage LVM, mount disk
         disk_operations_template = ERB.new <<-EOF
 #!/bin/bash
 # fdisk the disk if it's not a block device already:
@@ -69,24 +94,38 @@ echo "#{mnt_point} mounting returned:  $?" >> disk_operation_log.txt
 <% end %>
 exit $?
         EOF
+		end
 
         buffer = disk_operations_template.result(binding)
-        tmp_script = Tempfile.new("disk_operations_#{mnt_name}.sh")
-        target_script = "/tmp/disk_operations_#{mnt_name}.sh"
+		tmp_script = Tempfile.new("disk_operations_#{mnt_name}.sh")
+
+		if os == 'windows'
+			target_script = "disk_operations_#{mnt_name}.ps1"
+		else
+			target_script = "/tmp/disk_operations_#{mnt_name}.sh"
+		end
 
         File.open("#{tmp_script.path}", 'wb') do |f|
             f.write buffer
         end
         m.communicate.upload(tmp_script.path, target_script)
-        m.communicate.sudo("chmod 755 #{target_script}")
+		unless os == 'windows'
+			m.communicate.sudo("chmod 755 #{target_script}")
+		end
       end
 
       def run_disk_operations(m)
         return unless m.communicate.ready?
         mnt_name = m.config.persistent_storage.mountname
         mnt_name = 'vps' unless mnt_name != 0
-        target_script = "/tmp/disk_operations_#{mnt_name}.sh"
-        m.communicate.sudo("#{target_script}")
+		if m.config.vm.communicator == :winrm
+			target_script = "disk_operations_#{mnt_name}.ps1"
+			m.communicate.sudo("powershell -executionpolicy bypass -file #{target_script}")
+		else
+			target_script = "/tmp/disk_operations_#{mnt_name}.sh"
+			m.communicate.sudo("#{target_script}")
+		end
+
       end
 
       def manage_volumes(m)

data/lib/vagrant-persistent-storage/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

data/sample-win-vm/Vagrantfile

@@ -0,0 +1,22 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "myWindowsBox"
+
+  # These are required for Windows machines running under vagrant
+  config.vm.communicator = "winrm"
+  config.winrm.username = "Administrator"
+  config.winrm.password = "Password!"
+
+  # configure a persistent storage for mysql data
+  config.persistent_storage.enabled = true
+  config.persistent_storage.location = "virtualdrive.vdi"
+  config.persistent_storage.size = 5000
+
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin that creates a persistent storage and attaches it to
@@ -46,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -67,6 +67,7 @@ files:
 - locales/en.yml
 - sample-vm/.gitignore
 - sample-vm/Vagrantfile
+- sample-win-vm/Vagrantfile
 - vagrant-persistent-storage.gemspec
 homepage: https://github.com/kusnier/vagrant-persistent-storage
 licenses:
@@ -78,12 +79,12 @@ 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: []