vagrant-persistent-storage 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09e3185b33a92af6417f243a9a97a9700454d6ec'
-  data.tar.gz: af58114b16a94ef9cc42a31c4c5e722f19089bad
+  metadata.gz: 6c5cb664b3afdb9c69f0edbac2f802170c976a53
+  data.tar.gz: 0b638147e494cf69fbd22e3be9cee7115f2d7b69
 SHA512:
-  metadata.gz: 8c9c5b44a06a81f037fd6ddfee6ecdf38a1537b195c8d114429fd79fc012d148b51f6976e235f27633fb277c2e27256e6f1a6f459d0d445e9340a74e964bfe91
-  data.tar.gz: 15f09d640c8226735addf1be3d2cb91538755b5da577957ebef05297b966a21a54a631369c005e6f07cb793fad24046215fe0ebeb6445d24a39669f6aaac7d43
+  metadata.gz: 29768973693d388e28076d0e4553201843085a44c957225d2e4b46049fecc5a009b11a11284aea1fa27b85bb592f7af42c09e68cbeb6d65412bae41c719ea021
+  data.tar.gz: 789a035b9d325f30b0b0eb79a88cc2d2307af0e90c0353ff00d6b0a9b0a28759d50724b8f57ada8425501aafa38d50281bdf5f7555932bacf450ebba4cf27968

data/README.md

@@ -34,29 +34,46 @@ config.persistent_storage.mountoptions = ['defaults', 'prjquota']
 ```
 
 Device defaults to `/dev/sdb`. For boxes with multiple disks, make sure you increment the drive:
-```
+```ruby
 config.persistent_storage.diskdevice = '/dev/sdc'
 ```
 
+If you are using LVM and you would prefer to use the disk rather than a partition, you can set the following configuration:
+```ruby
+config.persistent_storage.partition = false
+```
+
 Every `vagrant up` will attach this file as hard disk to the guest machine.
-An `vagrant destroy` will detach the storage to avoid deletion of the storage by vagrant.
+A `vagrant destroy` will detach the storage to avoid deletion of the storage by vagrant.
 A `vagrant destroy` generally destroys all attached drives. See [VBoxMange unregistervm --delete option][vboxmanage_delete].
 
 The disk is initialized and added to it's own volume group as specfied in the config; 
 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
+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:
 
-```
+```ruby
 config.persistent_storage.drive_letter = 'Z'
 ```
 
 Options that are irrelevent to Windows are ignored, such as `mountname`, `filesystem`, `mountpoint` and `volgroupname`.
 
+## How Is The Storage Created?
+
+Based on the configuration provided, during a `vagrant up` a bash script is generated and uploaded to `/tmp/disk_operations_#{mnt_name}.sh` (Linux) or `disk_operations_#{mnt_name}.ps1` (Windows).  If the box has not been previously provisioned the script is executed on a `vagrant up`.  To force the scrip to be executed again you can run `vagrant provision` or if you have halted the box, `vagrant up --provision`.
+
+The outcome of the script being run is placed in the home drive of the vagrant user in a file called `disk_operation_log.txt`.
+
+## Optional settings
+
+```ruby
+config.persistent_storage.part_type_code = '82'
+```
+
 ## Troubleshooting
 
 If your box are not using LVM you must set `config.persistent_storage.use_lvm = false`.
@@ -82,6 +99,8 @@ If your box are not using LVM you must set `config.persistent_storage.use_lvm =
 * [Chen Yu Pao](https://github.com/windperson)
 * [Kris Reese](https://github.com/ktreese)
 * [Henry N.](https://github.com/HenryNe)
+* [fredleger](https://github.com/fredleger)
+* [Sebastian Wendel](https://github.com/sourceindex)
 
 ## TODO
 

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

@@ -15,16 +15,19 @@ module VagrantPlugins
       attr_accessor :mountname
       attr_accessor :mountpoint
       attr_accessor :mountoptions
+      attr_accessor :partition
       attr_accessor :diskdevice
       attr_accessor :filesystem
       attr_accessor :volgroupname
-	  attr_accessor :drive_letter
+      attr_accessor :drive_letter
+      attr_accessor :part_type_code
 
       alias_method :create?, :create
       alias_method :mount?, :mount
       alias_method :manage?, :manage
       alias_method :format?, :format
       alias_method :use_lvm?, :use_lvm
+      alias_method :partition?, :partition
       alias_method :enabled?, :enabled
 
       def initialize
@@ -35,6 +38,7 @@ module VagrantPlugins
         @format = true
         @use_lvm = true
         @enabled = false
+        @partition = true
         @location = UNSET_VALUE
         @mountname = UNSET_VALUE
         @mountpoint = UNSET_VALUE
@@ -42,7 +46,8 @@ module VagrantPlugins
         @diskdevice = UNSET_VALUE
         @filesystem = UNSET_VALUE
         @volgroupname = UNSET_VALUE
-		@drive_letter = UNSET_VALUE
+        @drive_letter = UNSET_VALUE
+        @part_type_code = UNSET_VALUE
       end
 
       def finalize!
@@ -52,30 +57,33 @@ module VagrantPlugins
         @manage = true if @manage == UNSET_VALUE
         @format = true if @format == UNSET_VALUE
         @use_lvm = true if @use_lvm == UNSET_VALUE
+        @partition = true if @partition == UNSET_VALUE
         @enabled = false if @enabled == UNSET_VALUE
-        @location = 0 if @location == UNSET_VALUE
-        @mountname = 0 if @mountname == UNSET_VALUE
-        @mountpoint = 0 if @mountpoint == UNSET_VALUE
-        @mountoptions = 0 if @mountoptions == UNSET_VALUE
-        @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
+        @location = "" if @location == UNSET_VALUE
+        @mountname = "" if @mountname == UNSET_VALUE
+        @mountpoint = "" if @mountpoint == UNSET_VALUE
+        @mountoptions = [] if @mountoptions == UNSET_VALUE
+        @diskdevice = "" if @diskdevice == UNSET_VALUE
+        @filesystem = "" if @filesystem == UNSET_VALUE
+        @volgroupname = "" if @volgroupname == UNSET_VALUE
+		    @drive_letter = 0 if @drive_letter == UNSET_VALUE
+        @part_type_code = "8e" if @part_type_code == UNSET_VALUE
       end
 
       def validate(machine)
-        errors = []
+        errors = _detected_errors
 
         errors << validate_bool('persistent_storage.create', @create)
         errors << validate_bool('persistent_storage.mount', @mount)
-        errors << validate_bool('persistent_storage.mount', @manage)
-        errors << validate_bool('persistent_storage.mount', @format)
-        errors << validate_bool('persistent_storage.mount', @use_lvm)
-        errors << validate_bool('persistent_storage.mount', @enabled)
+        errors << validate_bool('persistent_storage.manage', @manage)
+        errors << validate_bool('persistent_storage.format', @format)
+        errors << validate_bool('persistent_storage.use_lvm', @use_lvm)
+        errors << validate_bool('persistent_storage.enabled', @enabled)
+        errors << validate_bool('persistent_storage.partition', @partition)
         errors.compact!
 
-        if !machine.config.persistent_storage.size.kind_of?(String)
-          errors << I18n.t('vagrant_persistent_storage.config.not_a_string', {
+        if !machine.config.persistent_storage.size.kind_of?(Fixnum)
+          errors << I18n.t('vagrant_persistent_storage.config.not_a_number', {
             :config_key => 'persistent_storage.size',
             :is_class   => size.class.to_s,
           })
@@ -110,6 +118,12 @@ module VagrantPlugins
             :is_class   => filesystem.class.to_s,
           })
         end
+	if !machine.config.persistent_storage.volgroupname.part_type_code?(String)
+          errors << I18n.t('vagrant_persistent_storage.config.not_a_string', {
+            :config_key => 'persistent_storage.part_type_code',
+            :is_class   => volgroupname.class.to_s,
+          })
+        end
         if !machine.config.persistent_storage.volgroupname.kind_of?(String)
           errors << I18n.t('vagrant_persistent_storage.config.not_a_string', {
             :config_key => 'persistent_storage.volgroupname',
@@ -118,19 +132,21 @@ module VagrantPlugins
         end
 
         mount_point_path = Pathname.new("#{machine.config.persistent_storage.location}")
-        if ! mount_point_path.absolute?
+        if ! (mount_point_path.absolute? || mount_point_path.relative?)
           errors << I18n.t('vagrant_persistent_storage.config.not_a_path', {
             :config_key => 'persistent_storage.location',
             :is_path   => location.class.to_s,
           })
         end
 
-        { 'Persistent Storage configuration' => errors }
-
         if ! File.exists?@location.to_s and ! @create == "true"
-            return { "location" => ["file doesn't exist, and create set to false"] }
+          errors << I18n.t('vagrant_persistent_storage.config.no_create_and_missing', {
+            :config_key => 'persistent_storage.create',
+            :is_path   => location.class.to_s,
+          })       
         end
-        {}
+
+        { 'Persistent Storage configuration' => errors }
       end
 
       private

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

@@ -14,8 +14,10 @@ module VagrantPlugins
         fs_type = m.config.persistent_storage.filesystem
         manage = m.config.persistent_storage.manage
         use_lvm = m.config.persistent_storage.use_lvm
+        partition = m.config.persistent_storage.partition
         mount = m.config.persistent_storage.mount
         format = m.config.persistent_storage.format
+	part_type_code = m.config.persistent_storage.part_type_code
 
 		## windows filesystem options
 		drive_letter = m.config.persistent_storage.drive_letter
@@ -45,6 +47,7 @@ module VagrantPlugins
 		if os == "windows"
 			## shell script for windows to create NTFS partition and assign drive letter
 			disk_operations_template = ERB.new <<-EOF
+      	<% if partition == true %>
 			<% if format == true %>
 			foreach ($disk in get-wmiobject Win32_DiskDrive -Filter "Partitions = 0"){
 				$disk.DeviceID
@@ -52,26 +55,30 @@ module VagrantPlugins
 				"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 %>
+		<% end %>
 			EOF
 		else
 		## shell script to format disk, create/manage LVM, mount disk
         disk_operations_template = ERB.new <<-EOF
 #!/bin/bash
+<% if partition == true %>
 # fdisk the disk if it's not a block device already:
 re='[0-9][.][0-9.]*[0-9.]*'; [[ $(sfdisk --version) =~ $re ]] && version="${BASH_REMATCH}"
 if ! awk -v ver="$version" 'BEGIN { if (ver < 2.26 ) exit 1; }'; then
-	[ -b #{disk_dev}1 ] || echo 0,,8e | sfdisk #{disk_dev}
+	[ -b #{disk_dev}1 ] || echo 0,,#{part_type_code} | sfdisk #{disk_dev}
 else
-	[ -b #{disk_dev}1 ] || echo ,,8e | sfdisk #{disk_dev}
+	[ -b #{disk_dev}1 ] || echo ,,#{part_type_code} | sfdisk #{disk_dev}
 fi
 echo "fdisk returned:  $?" >> disk_operation_log.txt
+disk_dev=#{disk_dev}1
+<% end %>
 
 <% if use_lvm == true %>
 # Create the physical volume if it doesn't already exist:
-[[ `pvs #{disk_dev}1` ]] || pvcreate #{disk_dev}1
+[[ `pvs #{disk_dev}` ]] || pvcreate #{disk_dev}
 echo "pvcreate returned:  $?" >> disk_operation_log.txt
 # Create the volume group if it doesn't already exist:
-[[ `vgs #{vg_name}` ]] || vgcreate #{vg_name} #{disk_dev}1
+[[ `vgs #{vg_name}` ]] || vgcreate #{vg_name} #{disk_dev}
 echo "vgcreate returned:  $?" >> disk_operation_log.txt
 # Create the logical volume if it doesn't already exist:
 [[ `lvs #{vg_name} | grep #{mnt_name}` ]] || lvcreate -l 100%FREE -n #{mnt_name} #{vg_name}
@@ -83,7 +90,7 @@ echo "vg activation returned:  $?" >> disk_operation_log.txt
 
 <% if format == true  %>
 # Create the filesytem if it doesn't already exist
-MNT_NAME=#{mnt_name}
+MNT_NAME=#{vg_name}-#{mnt_name}
 [[ `blkid | grep ${MNT_NAME:0:16} | grep #{fs_type}` ]] || mkfs.#{fs_type} -L #{mnt_name} #{device}
 echo "#{fs_type} creation return:  $?" >> disk_operation_log.txt
 <% if mount == true %>

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.26"
+    VERSION = "0.0.27"
   end
 end

data/locales/en.yml

@@ -9,4 +9,7 @@ en:
       manage_storage: "** Managing persistent storage **"
     config:
       not_a_bool: "A value for %{config_key} can only be true or false, not type '%{value}'"
-      not_an_array_or_string: "A value for %{config_key} must be an Array or String, not type '%{is_class}'"
+      not_an_array_or_string: "A value for %{config_key} must be an Array or String, not type '%{value}'"
+      not_a_string: "A value for %{config_key} must be a String, not type '%{value}'"
+      not_a_path: "A value for %{config_key} must be resolveable as a path"
+      not_a_number: "A value for %{config_key} must be a number, not type '%{value}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that creates a persistent storage and attaches it to guest