commit 48a3294079b0fee0ad9d33f7c7262f6c87255947
author Gary Wu <gary.i.wu@huawei.com> Thu Nov 08 07:34:49 2018 -0800
committer Gary Wu <gary.i.wu@huawei.com> Thu Nov 08 16:39:52 2018 -0800
tree 73e15375e0d9487f1344dc6e0c7030ebf08e2a80
parent 8b764b35919133a5c92640dedc588539bda1124d

Alleviate startup disk contention issues

Add tuneable parameters in the heat template to
try to alleviate startup disk contention issues.

Also turn off use of RAM disk by default, reduce
size of Rancher VM, and use the RAM saved for an
extra k8s compute VM.

Change-Id: Ic638f33479338ebb9339b249ced9d6fa684935fa
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

deployment/heat/onap-oom/env/windriver/onap-oom-light.env

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
index c512c51..4ded3df 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
@@ -28,7 +28,7 @@
       openStackPrivateSubnetId: "__oam_subnet_id__"
       openStackPrivateNetCidr: "__oam_network_cidr__"
       openStackOamNetworkCidrPrefix: "10.0"
-      dcaeCollectorIp: "__k8s_1_vm_ip__"
+      dcaeCollectorIp: "__k8s_01_vm_ip__"
       vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"

deployment/heat/onap-oom/env/windriver/onap-oom.env

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 2ddda32..5ffbd8c 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -5,7 +5,7 @@
   apt_proxy: 10.12.5.2:8000
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m2.xlarge
+  rancher_vm_flavor: m1.xlarge
   k8s_vm_flavor: m1.xlarge
   etcd_vm_flavor: m1.large
   orch_vm_flavor: m1.xlarge
@@ -33,7 +33,7 @@
       openStackPrivateNetCidr: "__oam_network_cidr__"
       openStackSecurityGroup: "__sec_group__"
       openStackOamNetworkCidrPrefix: "10.0"
-      dcaeCollectorIp: "__k8s_1_vm_ip__"
+      dcaeCollectorIp: "__k8s_01_vm_ip__"
       vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
       demoArtifactsVersion: "1.3.0-SNAPSHOT"
       scriptVersion: "1.3.0-SNAPSHOT"