Increases mininum virtual controller RAM

nosdn virtual deployments are hitting OOM on controllers.  This patch
bumps controller minimum ram from 8 to 10 for nosdn, and 10 to 12 for
ODL.  Also, the maximum workers for gnocchi are limited to 1 for virtual
deployments.

JIRA: APEX-496

Change-Id: I50d38c60a682f00c14489c65ee8ee6305bc3dc62
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/virtual-environment.yaml b/build/virtual-environment.yaml
index 399a312..ac94e1b 100644 (file)
--- a/build/virtual-environment.yaml
+++ b/build/virtual-environment.yaml
@@ -11,3 +11,4 @@ parameter_defaults:
   NeutronWorkers: 1
   NovaWorkers: 1
   SwiftWorkers: 1
+  GnocchiMetricdWorkers: 1

diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh
index 8e15ef5..5f9e6ba 100755 (executable)
--- a/lib/virtual-setup-functions.sh
+++ b/lib/virtual-setup-functions.sh
@@ -50,8 +50,12 @@ EOF
       fi
     else
       capability="profile:control"
-      if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 10240 ]]; then
-         echo "WARN: RAM per controller too low.  OpenDaylight specified in HA deployment requires at least 10GB"
+      if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 12288 ]]; then
+         echo "WARN: RAM per controller too low.  OpenDaylight specified in deployment requires at least 12GB"
+         echo "INFO: Increasing RAM per controller to 12GB"
+         ramsize=12288
+      elif [[ "$ramsize" -lt 10240 ]]; then
+         echo "WARN: RAM per controller too low.  Deployment requires at least 10GB"
          echo "INFO: Increasing RAM per controller to 10GB"
          ramsize=10240
       fi