vagrant-persistent-storage 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc1d980eb4bca46f4323c4ee32c75cee63dca50
-  data.tar.gz: 9738ed07cd4c02c730bf7d03e1a3df78ffd93490
+  metadata.gz: 222ed37d94891036c944eb103454e251d8177ddf
+  data.tar.gz: 654612cbe9800c44d7f630df4892719c40e86063
 SHA512:
-  metadata.gz: ecd1adcf9d29b82d893849c60aa838ac839d937b8d122ee57df7cf83a4bf67cc373bcff7357550481ce3cfa363030f69586df372a8a4d4022684758f2129c2be
-  data.tar.gz: 7c0450d8de1d2a139c6d0e93c06d0f70fb564ed89308a9c4ebc8f4f5f85632e87d87302dfdd8dd153396df98f590d7aa3ccb560579889811e76ea709015ca336
+  metadata.gz: d727bada13e754b4b6ace84eb03f67a5eff977543dc0e139df8e8c2d56e28a34f88e13810819e9e9a907ba95ccf2b351f6ce81d3bfb58c69e1973d11383b444d
+  data.tar.gz: 336ae22a9c30aca631baf233c02b6aee658d83ae8a11b725f3b7071d51cc29008e6a74f77d7967fa716679c109be32e0a927986c23fa567be11fcfb1b37f8612

data/README.md

@@ -34,29 +34,40 @@ 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
@@ -90,6 +101,7 @@ If your box are not using LVM you must set `config.persistent_storage.use_lvm =
 * [Henry N.](https://github.com/HenryNe)
 * [fredleger](https://github.com/fredleger)
 * [Sebastian Wendel](https://github.com/sourceindex)
+* [Ben Phegan](https://github.com/BenPhegan)
 
 ## TODO
 

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

@@ -15,6 +15,7 @@ module VagrantPlugins
       attr_accessor :mountname
       attr_accessor :mountpoint
       attr_accessor :mountoptions
+      attr_accessor :partition
       attr_accessor :diskdevice
       attr_accessor :filesystem
       attr_accessor :volgroupname
@@ -26,6 +27,7 @@ module VagrantPlugins
       alias_method :manage?, :manage
       alias_method :format?, :format
       alias_method :use_lvm?, :use_lvm
+      alias_method :partition?, :partition
       alias_method :enabled?, :enabled
 
       def initialize
@@ -36,6 +38,7 @@ module VagrantPlugins
         @format = true
         @use_lvm = true
         @enabled = false
+        @partition = true
         @location = UNSET_VALUE
         @mountname = UNSET_VALUE
         @mountpoint = UNSET_VALUE
@@ -54,31 +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,
           })
@@ -113,6 +118,12 @@ module VagrantPlugins
             :is_class   => filesystem.class.to_s,
           })
         end
+        if !machine.config.persistent_storage.part_type_code.kind_of?(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',
@@ -121,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,9 +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
+				part_type_code = m.config.persistent_storage.part_type_code
 
 		## windows filesystem options
 		drive_letter = m.config.persistent_storage.drive_letter
@@ -27,16 +28,16 @@ module VagrantPlugins
 			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
-        mnt_options = ['defaults'] unless mnt_options != 0
-        fs_type = 'ext3' unless fs_type != 0
-        if use_lvm
-          device = "/dev/#{vg_name}/#{mnt_name}"
-        else
-          device = "#{disk_dev}1"
-        end
+    vg_name = 'vps' unless vg_name != ""
+    disk_dev = '/dev/sdb' unless disk_dev != ""
+    mnt_name = 'vps' unless mnt_name != ""
+    mnt_options = ['defaults'] unless mnt_options.any?
+    fs_type = 'ext3' unless fs_type != ""
+    if use_lvm
+      device = "/dev/#{vg_name}/#{mnt_name}"
+    else
+      device = "#{disk_dev}1"
+    end
 		if drive_letter == 0
 			drive_letter = ""
 		else
@@ -46,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
@@ -53,26 +55,31 @@ 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
+DISK_DEV=#{disk_dev}
+<% 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,,#{part_type_code} | sfdisk #{disk_dev}
+	[ -b ${DISK_DEV}1 ] || echo 0,,#{part_type_code} | sfdisk $DISK_DEV
 else
-	[ -b #{disk_dev}1 ] || echo ,,#{part_type_code} | 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}
@@ -84,7 +91,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.32"
+    VERSION = "0.0.33"
   end
 end

data/locales/en.yml

@@ -9,4 +9,8 @@ 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}'"
+      no_create_and_missing: "File doesn't exist, and create set to false"

data/sample-vm/partition-false.vagrantfile

@@ -0,0 +1,30 @@
+# -*- 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 = "precise32"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  #config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+
+  # configure a persistent storage for mysql data
+  config.persistent_storage.enabled = true
+  config.persistent_storage.location = "virtualdrive.vdi"
+  config.persistent_storage.size = 5000
+  config.persistent_storage.mountname = 'mysql'
+  config.persistent_storage.filesystem = 'ext4'
+  config.persistent_storage.mountpoint = '/var/lib/mysql'
+  config.persistent_storage.volgroupname = 'myvolgroup'
+  config.persistent_storage.partition = false
+
+  config.vm.provision "fix-no-tty", type: "shell" do |s|
+      s.privileged = false
+      s.inline = "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile"
+    end
+  end

data/sample-vm/{Vagrantfile → partition-true.vagrantfile}

@@ -22,4 +22,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.persistent_storage.mountpoint = '/var/lib/mysql'
   config.persistent_storage.volgroupname = 'myvolgroup'
 
-end
+  config.vm.provision "fix-no-tty", type: "shell" do |s|
+      s.privileged = false
+      s.inline = "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile"
+    end
+  end

data/test.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+pushd sample-vm > /dev/null
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+        VBOXMANAGE=`which vboxmanage`
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+        VBOXMANAGE=`which vboxmanage`
+elif [[ "$OSTYPE" == "cygwin" ]]; then
+		VBOXMANAGE="/c/Program Files/Oracle/VirtualBox/VBoxManage.exe"
+elif [[ "$OSTYPE" == "msys" ]]; then
+		VBOXMANAGE="/c/Program Files/Oracle/VirtualBox/VBoxManage.exe"
+elif [[ "$OSTYPE" == "win32" ]]; then
+		VBOXMANAGE="/c/Program Files/Oracle/VirtualBox/VBoxManage.exe"
+elif [[ "$OSTYPE" == "freebsd"* ]]; then
+        VBOXMANAGE=`which vboxmanage`
+else
+        echo Seriously, what the hell are you running me on????
+		exit 1
+fi
+
+FILES=*.vagrantfile
+for f in $FILES
+do
+	echo Testing $f
+	VAGRANT_VAGRANTFILE="$f" vagrant up --no-color > $f.log
+	VAGRANT_VAGRANTFILE="$f" vagrant ssh -- "mount | grep -q mysql"
+	RESULT=$?
+	if [ $RESULT -eq 0 ]; then
+		echo ...[PASSED]
+	else
+		echo ...[FAILED]
+	fi
+	VAGRANT_VAGRANTFILE="$f" vagrant destroy -f --no-color >> $f.log && "$VBOXMANAGE" closemedium disk virtualdrive.vdi --delete >> $f.log 2>&1 
+done
+
+
+popd > /dev/null

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,8 +66,10 @@ files:
 - lib/vagrant-persistent-storage/version.rb
 - locales/en.yml
 - sample-vm/.gitignore
-- sample-vm/Vagrantfile
+- sample-vm/partition-false.vagrantfile
+- sample-vm/partition-true.vagrantfile
 - sample-win-vm/Vagrantfile
+- test.sh
 - vagrant-persistent-storage.gemspec
 homepage: https://github.com/kusnier/vagrant-persistent-storage
 licenses: