Merge "rebase onap oom to beijing release"

1 files changed, 6 insertions, 15 deletions

diff --git a/src/vagrant/kubeadm_onap/Vagrantfile b/src/vagrant/kubeadm_onap/Vagrantfile
index fe24252..73c442d 100644
--- a/src/vagrant/kubeadm_onap/Vagrantfile
+++ b/src/vagrant/kubeadm_onap/Vagrantfile
@@ -1,17 +1,17 @@
-$num_workers=1
+$num_workers=3
 
 Vagrant.require_version ">= 1.8.6"
 Vagrant.configure("2") do |config|
 
-  config.vm.box = "yk0/ubuntu-xenial"
-  config.vm.provision "shell", path: "host_setup.sh", privileged: false
+  config.vm.box = "ceph/ubuntu-xenial"
 
   config.vm.define "master" do |config|
     config.vm.hostname = "master"
+    config.vm.provision "shell", path: "host_setup.sh", privileged: false
     config.vm.provision "shell", path: "master_setup.sh", privileged: false
     config.vm.network :private_network, ip: "192.168.0.10"
     config.vm.provider :libvirt do |libvirt|
-      libvirt.memory = 4096
+      libvirt.memory = 8192
       libvirt.cpus = 4
     end
   end
@@ -19,23 +19,14 @@ Vagrant.configure("2") do |config|
   (1 .. $num_workers).each do |i|
     config.vm.define vm_name = "worker%d" % [i] do |config|
       config.vm.hostname = vm_name
+      config.vm.provision "shell", path: "host_setup.sh", privileged: false
       config.vm.provision "shell", path: "worker_setup.sh", privileged: false
       config.vm.network :private_network, ip: "192.168.0.#{i+20}"
       config.vm.provider :libvirt do |libvirt|
-        libvirt.memory = 81920
+        libvirt.memory = 51200
         libvirt.cpus = 32
       end
     end
   end
 
-  config.vm.define "onap" do |config|
-    config.vm.hostname = "onap"
-    config.vm.provision "shell", path: "onap_setup.sh", privileged: false
-    config.vm.network :private_network, ip: "192.168.0.5"
-    config.vm.provider :libvirt do |libvirt|
-      libvirt.memory = 2048
-      libvirt.cpus = 1
-    end
-  end
-
 end