[CORD-2259]
Xenial (16.04) compat
Change-Id: I1cc9fd7b259f3101aaf46047dc1355257fd583a3
diff --git a/scenarios/cord/Vagrantfile b/scenarios/cord/Vagrantfile
index 0eb75e2..1ffce2c 100644
--- a/scenarios/cord/Vagrantfile
+++ b/scenarios/cord/Vagrantfile
@@ -30,8 +30,8 @@
d.vm.provider :libvirt do |v, override|
v.memory = settings['dev_vm_mem']
v.cpus = settings['dev_vm_cpu']
- override.vm.synced_folder $cordpath, settings['build_cord_dir'], type: "nfs"
- override.vm.synced_folder settings['host_cord_profile_dir'], settings['build_cord_profile_dir'], type: "nfs"
+ override.vm.synced_folder $cordpath, settings['build_cord_dir'], type: "nfs", nfs_udp: false, nfs_version: 4
+ override.vm.synced_folder settings['host_cord_profile_dir'], settings['build_cord_profile_dir'], type: "nfs", nfs_udp: false, nfs_version: 4
end
end
@@ -65,7 +65,7 @@
v.memory = settings['head_vm_mem']
v.cpus = settings['head_vm_cpu']
v.storage :file, :size => '100G', :type => 'qcow2'
- override.vm.synced_folder $cordpath, $ciab_dir, type: "nfs"
+ override.vm.synced_folder $cordpath, $ciab_dir, type: "nfs", nfs_udp: false, nfs_version: 4
override.vm.provision :ansible do |ansible|
ansible.playbook = $cordpath + "/build/ansible/add-extra-drive.yml" # Needs testing
end
diff --git a/scenarios/mock/Vagrantfile b/scenarios/mock/Vagrantfile
index f688ee9..1b39bf9 100644
--- a/scenarios/mock/Vagrantfile
+++ b/scenarios/mock/Vagrantfile
@@ -25,9 +25,12 @@
vb.memory = settings['head_vm_mem']
vb.cpus = settings['head_vm_cpu']
end
- d.vm.provider :libvirt do |v|
+ d.vm.provider :libvirt do |v, override|
v.memory = settings['head_vm_mem']
v.cpus = settings['head_vm_cpu']
+ override.vm.synced_folder "../../../", "/opt/cord/", type: "nfs", nfs_udp: false, nfs_version: 4
+ override.vm.synced_folder "../../../../cord_profile/", "/opt/cord_profile/", type: "nfs", nfs_udp: false, nfs_version: 4
+ override.vm.synced_folder "../../platform-install/credentials/", "/opt/credentials/", type: "nfs", nfs_udp: false, nfs_version: 4
end
end
diff --git a/scenarios/single/Vagrantfile b/scenarios/single/Vagrantfile
index b8092c8..a1c07cd 100644
--- a/scenarios/single/Vagrantfile
+++ b/scenarios/single/Vagrantfile
@@ -25,9 +25,12 @@
vb.memory = settings['head_vm_mem']
vb.cpus = settings['head_vm_cpu']
end
- d.vm.provider :libvirt do |v|
+ d.vm.provider :libvirt do |v, override|
v.memory = settings['head_vm_mem']
v.cpus = settings['head_vm_cpu']
+ override.vm.synced_folder "../../../", "/opt/cord/", type: "nfs", nfs_udp: false, nfs_version: 4
+ override.vm.synced_folder "../../../../cord_profile/", "/opt/cord_profile/", type: "nfs", nfs_udp: false, nfs_version: 4
+ override.vm.synced_folder "../../platform-install/credentials/", "/opt/credentials/", type: "nfs", nfs_udp: false, nfs_version: 4
end
end