Merge pull request #263 from lemberg/task/misc-updates

Misc updates to Vagrant config

Vagrantfile

@@ -136,8 +136,10 @@ 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)
+    # Set VirtualBox disk size (defaults to 40Gb)
     config.disksize.size = configuration.get("virtualbox.disk_size")
+    # Set checking for Guest Additions
+    v.check_guest_additions = configuration.get("virtualbox.check_guest_additions")
 
     # Use host's resolver mechanisms to handle DNS requests.
     v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]

default.vm-settings.yml

@@ -46,6 +46,8 @@ vagrant:
     id: default
     type: nfs
     create: true
+    # Disable UDP protocol for NFS, see https://discourse.ubuntu.com/t/jammy-jellyfish-release-notes/24668
+    nfs_udp: false
 
 # VirtualBox configuration.
 #
@@ -82,6 +84,8 @@ virtualbox:
   # VirtualBox disk size (added by vagrant-disksize plugin).
   # See https://github.com/sprotheroe/vagrant-disksize
   disk_size: 40GB
+  # Checking for Guest Additions.
+  check_guest_additions: false
 
 # Ansible local configuration.
 ansible:

provisioning/src/configuration.rb

@@ -129,8 +129,6 @@ def merge_default_settings
     self.get_git_credentials
     # Use *.test domain (RFC 2606).
     self.set("vagrant.hostname", self.get("vagrant.hostname") + '.test');
-    # Disable UDP protocol for NFS, see https://discourse.ubuntu.com/t/jammy-jellyfish-release-notes/24668
-    self.set("vagrant.synced_folder_options.nfs_udp", false);
     # Symbolize synced folder options.
     self.symbolize_synced_folder_options
     # Set correct Ansible version to install when wildcard version constraint