summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-07-28 10:12:07 -0400
committerTim Rozet <trozet@redhat.com>2017-07-28 10:12:07 -0400
commit64e055560e1f3ed47805d921541d884ea79624cf (patch)
tree2055d2ea2378ad0ca49cbdede8c2af6e007a98dd
parent0890153eb47fd29abf6ec419096546103aa22616 (diff)
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>
-rw-r--r--build/virtual-environment.yaml1
-rwxr-xr-xlib/virtual-setup-functions.sh8
2 files changed, 7 insertions, 2 deletions
diff --git a/build/virtual-environment.yaml b/build/virtual-environment.yaml
index 399a312..ac94e1b 100644
--- 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
--- 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