Merge pull request #109 from lemberg/feature/vagrant-disksize

Add vagrant-disksize plugin
lemberg · Oct 24, 2019 · b07c798 · b07c798
2 parents 9cd3f2e + a293ce2
commit b07c798
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Draft Environment 3.x.x
 
+- [GH-96](https://github.com/lemberg/draft-environment/issues/96) - Added vagrant-disksize plugin, which allows to alter VirtualBox disk size. By default VirtualBox disk size is capped at 10Gb, which is fine for most of the projects, unless project has huge database. Introduced new variable `virtualbox.disk_size` (defaults to `10Gb`)
 - [GH-104](https://github.com/lemberg/draft-environment/issues/104) - Bump minimum supported Vagrant version to 2.2.6
 - [GH-106](https://github.com/lemberg/draft-environment/issues/106) - Converted tests to support Molecule 2
 

diff --git a/README.md b/README.md
@@ -20,6 +20,10 @@ Manages host and/or guest `hosts` files. Draft is configured to create a `hostna
 
 Automatically installs the host's VirtualBox Guest Additions on the guest system.
 
+#### [vagrant-disksize](https://github.com/sprotheroe/vagrant-disksize)
+
+A Vagrant plugin to resize disks in VirtualBox.
+
 #### Vagrant WinNFSd (WINDOWS only)
 
 Dramatically increases disk IO on Windows by adding NFS support.

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -41,6 +41,13 @@ TBD
       version: 2.6.*
     ```
 
+- Add new variable `virtualbox.disk_size` to the `vm-settings.yml` file in order to set VirtualBox disk size:
+
+    ```
+    virtualbox:
+      disk_size: 10Gb
+    ```
+
 - If `solr_cores` variable was overwritten, them convert it to the new format, see [UPGRADE.md 1.x.x -> 2.0.x](https://github.com/T2L/ansible-role-solr/blob/2.0.0/UPGRADE.md#1xx---20x)
 
 ## Then run

diff --git a/Vagrantfile b/Vagrantfile
@@ -3,8 +3,11 @@
 
 # Before we start: auto-install recommended plugins. Code borrowed here:
 # https://github.com/hashicorp/vagrant/issues/8055#issuecomment-403171757
-# Install Vagrant Host Manager and vagrant-vbguest.
-required_plugins = %w(vagrant-hostmanager vagrant-vbguest)
+# Installs:
+#   - vagrant-hostmanager - https://github.com/devopsgroup-io/vagrant-hostmanager
+#   - vagrant-vbguest - https://github.com/dotless-de/vagrant-vbguest
+#   - vagrant-disksize - https://github.com/sprotheroe/vagrant-disksize
+required_plugins = %w(vagrant-hostmanager vagrant-vbguest vagrant-disksize)
 
 # Additionally install Vagrant WinNFSd on Windows hosts.
 require "rbconfig"
@@ -137,6 +140,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.memory = configuration.get("virtualbox.memory")
     # Set CPU execution cap (in %).
     v.customize ["modifyvm", :id, "--cpuexecutioncap", configuration.get("virtualbox.cpuexecutioncap")]
+    # Set VirtualBox disk size (defaults to 10Gb)
+    config.disksize.size = configuration.get("virtualbox.disk_size")
+
     # Use host's resolver mechanisms to handle DNS requests.
     v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
     # Allow creation of symlinks in VirtualBox shared folders (works with both

diff --git a/default.vm-settings.yml b/default.vm-settings.yml
@@ -65,6 +65,9 @@ virtualbox:
   # CPU execution cap (in %). Lower this value if host machine has single core
   # CPU.
   cpuexecutioncap: 100
+  # VirtualBox disk size (added by vagrant-disksize plugin).
+  # See https://github.com/sprotheroe/vagrant-disksize
+  disk_size: 10Gb
 
 # Ansible local configuration.
 ansible: