summaryrefslogtreecommitdiffstats
path: root/deployment/heat
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-10-18 16:08:19 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-10-18 16:47:32 -0700
commit1ac488373e7edc0d12ceeedd184c252ba9b0a5a9 (patch)
tree06fee5c1070fe839089a7b5788effbc2d87acc31 /deployment/heat
parentedf2ae48f11e8be8bd9b60b840930c4be00ee15a (diff)
Re-enable use of RAM disk for /dockerdata-nfs
Change-Id: Ib9bbcb3c5ceb83427b735ed061a921a28812a802 Issue-ID: INT-586 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat')
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh6
3 files changed, 5 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index d5c024704..2440473f4 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -5,7 +5,7 @@ parameters:
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
- rancher_vm_flavor: m4.xlarge
+ rancher_vm_flavor: m5.xlarge
k8s_vm_flavor: m4.xlarge
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index a44eca9f3..9b122e51b 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 @@ parameters:
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
- rancher_vm_flavor: m1.xlarge
+ rancher_vm_flavor: m2.xlarge
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index 9e70da6d1..a2b9f503c 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -67,9 +67,9 @@ while ! hash jq &> /dev/null; do
done
# use RAM disk for /dockerdata-nfs for testing
-#echo "tmpfs /dockerdata-nfs tmpfs noatime 1 2" >> /etc/fstab
+echo "tmpfs /dockerdata-nfs tmpfs noatime,size=75% 1 2" >> /etc/fstab
mkdir -pv /dockerdata-nfs
-#mount /dockerdata-nfs
+mount /dockerdata-nfs
# version control the persistence volume to see what's happening
chmod 777 /dockerdata-nfs/
@@ -84,7 +84,7 @@ git commit -m "initial commit"
# export NFS mount
NFS_EXP=""
for K8S_VM_IP in $(tr -d ',[]' < /opt/config/k8s_private_ips.txt); do
- NFS_EXP+="$K8S_VM_IP(rw,fsid=1,sync,no_root_squash,no_subtree_check) "
+ NFS_EXP+="$K8S_VM_IP(rw,fsid=1,async,no_root_squash,no_subtree_check) "
done
echo "/dockerdata-nfs $NFS_EXP" | tee /etc/exports