diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 828d2f8b3..6a7635b6b 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -44,7 +44,7 @@ Quick Start
     vagrant plugin install vagrant-cachier
     vagrant plugin install vagrant-vbguest
 
-3. Adjust the settings in `vagrant/provisioning/virtualbox.conf.yml` if needed (5GB RAM is the
+3. Adjust the settings in `vagrant/provisioning/dragonflow.conf.yml` if needed (5GB RAM is the
    minimum to get 1 VM running on the controller node)
 
 4. Launch the VM's: `vagrant up`
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index d27f0eff0..e84a0d600 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -12,7 +12,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'yes'
 
 require 'yaml'
 
-vagrant_config = YAML.load_file("provisioning/virtualbox.conf.yml")
+vagrant_config = YAML.load_file("provisioning/dragonflow.conf.yml")
 
 Vagrant.configure(2) do |config|
   config.vm.box = vagrant_config['box']
@@ -34,7 +34,7 @@ Vagrant.configure(2) do |config|
      override.vm.box = ENV.fetch('VAGRANT_OVN_VM_BOX', 'generic/ubuntu1604')
   end
 
-  # Bring up the Devstack controller node on Virtualbox
+  # Bring up the Devstack controller node on the hypervisor
   config.vm.define "devstack_controller" do |devstack_controller|
     devstack_controller.vm.host_name = vagrant_config['devstack_controller']['host_name']
     devstack_controller.vm.network "private_network", ip: vagrant_config['devstack_controller']['ip']
@@ -55,44 +55,27 @@ Vagrant.configure(2) do |config|
     end
   end
 
-  # Bring up the Devstack compute nodes on Virtualbox
-  config.vm.define "devstack_compute1" do |devstack_compute1|
-    devstack_compute1.vm.host_name = vagrant_config['devstack_compute1']['host_name']
-    devstack_compute1.vm.network "private_network", ip: vagrant_config['devstack_compute1']['ip']
-    devstack_compute1.vm.provision "shell", path: "provisioning/setup-base.sh", privileged: false
-    devstack_compute1.vm.provision "shell", path: "provisioning/setup-compute.sh", privileged: false, :args => "#{vagrant_config['devstack_controller']['ip']}"
+  # Bring up the Devstack compute nodes on the hypervisor
+  (1..2).each do |i|
+    config.vm.define "devstack_compute#{i}" do |devstack_compute|
+      devstack_compute.vm.host_name = vagrant_config["devstack_compute#{i}"]['host_name']
+      devstack_compute.vm.network "private_network", ip: vagrant_config["devstack_compute#{i}"]['ip']
+      devstack_compute.vm.provision "shell", path: "provisioning/setup-base.sh", privileged: false
+      devstack_compute.vm.provision "shell", path: "provisioning/setup-compute.sh", privileged: false, :args => "#{vagrant_config['devstack_controller']['ip']}"
 
-    config.vm.provider "virtualbox" do |vb|
-       vb.memory = vagrant_config['devstack_compute1']['memory']
-       vb.cpus = vagrant_config['devstack_compute1']['cpus']
-    end
-    config.vm.provider 'parallels' do |vb|
-       vb.memory = vagrant_config['devstack_compute1']['memory']
-       vb.cpus = vagrant_config['devstack_compute1']['cpus']
-    end
-    config.vm.provider 'libvirt' do |vb|
-       vb.memory = vagrant_config['devstack_compute1']['memory']
-       vb.cpus = vagrant_config['devstack_compute1']['cpus']
+      config.vm.provider "virtualbox" do |vb|
+         vb.memory = vagrant_config["devstack_compute#{i}"]['memory']
+         vb.cpus = vagrant_config["devstack_compute#{i}"]['cpus']
+      end
+      config.vm.provider 'parallels' do |vb|
+         vb.memory = vagrant_config["devstack_compute#{i}"]['memory']
+         vb.cpus = vagrant_config["devstack_compute#{i}"]['cpus']
+      end
+      config.vm.provider 'libvirt' do |vb|
+         vb.memory = vagrant_config["devstack_compute#{i}"]['memory']
+         vb.cpus = vagrant_config["devstack_compute#{i}"]['cpus']
+      end
     end
   end
 
-  config.vm.define "devstack_compute2" do |devstack_compute2|
-    devstack_compute2.vm.host_name = vagrant_config['devstack_compute2']['host_name']
-    devstack_compute2.vm.network "private_network", ip: vagrant_config['devstack_compute2']['ip']
-    devstack_compute2.vm.provision "shell", path: "provisioning/setup-base.sh", privileged: false
-    devstack_compute2.vm.provision "shell", path: "provisioning/setup-compute.sh", privileged: false, :args => "#{vagrant_config['devstack_controller']['ip']}"
-
-    config.vm.provider "virtualbox" do |vb|
-       vb.memory = vagrant_config['devstack_compute2']['memory']
-       vb.cpus = vagrant_config['devstack_compute2']['cpus']
-    end
-    config.vm.provider 'parallels' do |vb|
-       vb.memory = vagrant_config['devstack_compute2']['memory']
-       vb.cpus = vagrant_config['devstack_compute2']['cpus']
-    end
-    config.vm.provider 'libvirt' do |vb|
-       vb.memory = vagrant_config['devstack_compute2']['memory']
-       vb.cpus = vagrant_config['devstack_compute2']['cpus']
-    end
-  end
 end
diff --git a/vagrant/provisioning/virtualbox.conf.yml b/vagrant/provisioning/dragonflow.conf.yml
similarity index 100%
rename from vagrant/provisioning/virtualbox.conf.yml
rename to vagrant/provisioning/dragonflow.conf.yml