Increase resources for K8s worker node

This patch also changes how resources are assigned to local
infrastructure nodes due to increasing number of specific cases.

Issue-ID: ONAPARC-537
Change-Id: I914b40508ab388b99d5f124ab1369b152a8ca765
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

diff --git a/bootstrap/vagrant-minimal-onap/Vagrantfile b/bootstrap/vagrant-minimal-onap/Vagrantfile
index 0f26ec8..78668df 100644 (file)
--- a/bootstrap/vagrant-minimal-onap/Vagrantfile
+++ b/bootstrap/vagrant-minimal-onap/Vagrantfile
@@ -13,19 +13,19 @@ cluster_yml = "cluster.yml"
 apt_prefs_dir = "/etc/apt/apt.conf.d"
 apt_prefs = "95silent-approval"
 
-vm_memory = 2 * 1024
-vm_memory_os = 8 * 1024
-vm_cpus = 1
-vm_cpus_os = 2
+vm_memory = 1 * 1024
+vm_memory_os = 6 * 1024
+vm_memory_onap = 12 * 1024
+vm_cpu = 1
+vm_cpus = 2
 vm_box = "generic/ubuntu1804"
 
-operation = { name: 'operator', hostname: 'operator', ip: '172.17.4.254' }
-devstack = { name: 'devstack', hostname: 'devstack', ip: '172.17.4.200' }
-cluster = [
-  { name: 'control', hostname: 'control', ip: '172.17.4.100' },
-  { name: 'worker', hostname: 'worker', ip: '172.17.4.101' }
-]
+operation = { name: 'operator', hostname: 'operator', ip: '172.17.4.254', cpus: vm_cpu, memory: vm_memory }
+devstack = { name: 'devstack', hostname: 'devstack', ip: '172.17.4.200', cpus: vm_cpus, memory: vm_memory_os }
+control = { name: 'control', hostname: 'control', ip: '172.17.4.100', cpus: vm_cpu, memory: vm_memory }
+worker = { name: 'worker', hostname: 'worker', ip: '172.17.4.101', cpus: vm_cpus, memory: vm_memory_onap }
 
+cluster = [] << control << worker
 all = cluster.dup << operation << devstack
 
 operation_post_msg = "Run: \"vagrant provision #{operation[:name]} --provision-with=rke_up,setup_kubectl\" to complete cluster creation"
@@ -121,13 +121,13 @@ Vagrant.configure('2') do |config|
 
       config.vm.provider :virtualbox do |v|
         v.name = machine[:name]
-        v.memory = machine[:name] != 'devstack' ? vm_memory : vm_memory_os
-        v.cpus = machine[:name] != 'devstack' ? vm_cpus : vm_cpus_os
+        v.memory = machine[:memory]
+        v.cpus = machine[:cpus]
       end
 
       config.vm.provider :libvirt do |v|
-        v.memory = machine[:name] != 'devstack' ? vm_memory : vm_memory_os
-        v.cpus = machine[:name] != 'devstack' ? vm_cpus : vm_cpus_os
+        v.memory = machine[:memory]
+        v.cpus = machine[:cpus]
       end
 
       config.vm.network :private_network, ip: machine[:ip]