From 794a3978adeb7616f79dfe96e0bc7fe3bc2170fb Mon Sep 17 00:00:00 2001
From: Pawel Wieczorek <p.wieczorek2@samsung.com>
Date: Mon, 3 Feb 2020 16:20:47 +0100
Subject: Use ONAP core deployment type override in minimal Vagrant environment

Core deployment type is a subset of previously used minimal override to
make ONAP deployment even lighter on resources.

It has been merged in OOM as: d7c495eeeaa3c24d355b9214bc7d0e59be9dd70e
(Change-Id: Ibaec41f088f11f7fb4e7c476f742d12d29c5740b).

This patch also updates documentation on resources required by this
setup and adds example usage of Operator's tools.

Issue-ID: ONAPARC-551
Change-Id: Ifdb1d158311ba3ed0b5cf407d07ce028d1a0162f
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
---
 bootstrap/vagrant-minimal-onap/README.rst  | 32 +++++++++++++++++-------------
 bootstrap/vagrant-minimal-onap/Vagrantfile |  8 ++++----
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/vagrant-minimal-onap/README.rst b/bootstrap/vagrant-minimal-onap/README.rst
index 40957f752..1315a00e8 100644
--- a/bootstrap/vagrant-minimal-onap/README.rst
+++ b/bootstrap/vagrant-minimal-onap/README.rst
@@ -50,19 +50,19 @@ Following set of commands can be used to prepare a machine running Ubuntu 18.04
 Requirements
 ------------
 
-+-------------+-----+-------+
-| Machine     | CPU |  RAM  |
-+-------------+-----+-------+
-| Operator    |  1  | 1GiB  |
-+-------------+-----+-------+
-| Devstack    |  1  | 4GiB  |
-+-------------+-----+-------+
-| K8s Control |  1  | 1GiB  |
-+-------------+-----+-------+
-| K8s Worker  |  4  | 20GiB |
-+-------------+-----+-------+
-| TOTAL       |  7  | 26GiB |
-+-------------+-----+-------+
++-------------+-----+-------+---------+
+| Machine     | CPU |  RAM  | Storage |
++-------------+-----+-------+---------+
+| Operator    |  1  | 1GiB  |  32GiB  |
++-------------+-----+-------+---------+
+| Devstack    |  1  | 4GiB  |  32GiB  |
++-------------+-----+-------+---------+
+| K8s Control |  1  | 1GiB  |  32GiB  |
++-------------+-----+-------+---------+
+| K8s Worker  |  8  | 64GiB |  64GiB  |
++-------------+-----+-------+---------+
+| TOTAL       | 11  | 70GiB |  160GiB |
++-------------+-----+-------+---------+
 
 Table above is based on current experience and may be subject to change.
 
@@ -126,4 +126,8 @@ be available on Operator's machine. It can be accessed by executing:
    vagrant ssh operator
 
 Although appropriate context is set for `kubectl` on login, when interacting with the cluster the
-`onap` namespace has to be explicitly specified.
+`onap` namespace has to be explicitly specified. Example:
+
+.. code-block:: sh
+   # Operator's machine shell
+   kubectl -nonap get pods
diff --git a/bootstrap/vagrant-minimal-onap/Vagrantfile b/bootstrap/vagrant-minimal-onap/Vagrantfile
index 3ffa6a368..5f9a725cc 100644
--- a/bootstrap/vagrant-minimal-onap/Vagrantfile
+++ b/bootstrap/vagrant-minimal-onap/Vagrantfile
@@ -16,9 +16,9 @@ apt_prefs = "95silent-approval"
 
 vm_memory = 1 * 1024
 vm_memory_os = 4 * 1024
-vm_memory_onap = 20 * 1024
+vm_memory_onap = 64 * 1024
 vm_cpu = 1
-vm_cpus = 4
+vm_cpus = 8
 vm_box = "generic/ubuntu1804"
 vm_disk = 32
 vm_disk_onap = 64
@@ -178,7 +178,7 @@ $setup_helm_repo = <<-SCRIPT
 SCRIPT
 
 $deploy_onap = <<-SCRIPT
-  OVERRIDE="${1:-${HOME}/oom/kubernetes/onap/resources/environments/minimal-onap.yaml}"
+  OVERRIDE="${1:-${HOME}/oom/kubernetes/onap/resources/environments/core-onap.yaml}"
 
   ENV="${2:-#{os_env}}"
   export $(cat "$ENV" | xargs)
@@ -194,7 +194,7 @@ $deploy_onap = <<-SCRIPT
 
   export KUBECONFIG="${HOME}/.kube/config.onap"
 
-  helm deploy minimal local/onap --namespace onap -f "$OVERRIDE" --verbose --timeout 900
+  helm deploy core local/onap --namespace onap -f "$OVERRIDE" --verbose --timeout 900
 SCRIPT
 
 Vagrant.configure('2') do |config|
-- 
cgit 1.2.3-korg