summaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-11-08 07:34:49 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-11-08 16:39:52 -0800
commit48a3294079b0fee0ad9d33f7c7262f6c87255947 (patch)
tree73e15375e0d9487f1344dc6e0c7030ebf08e2a80 /deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
parent8b764b35919133a5c92640dedc588539bda1124d (diff)
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>
Diffstat (limited to 'deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh')
-rwxr-xr-xdeployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
index 570011128..1167496c5 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -61,16 +61,18 @@ cat <<EOF
__rancher_agent_version__: { get_param: rancher_agent_version }
__kubectl_version__: { get_param: kubectl_version }
__helm_version__: { get_param: helm_version }
+ __helm_deploy_delay__: { get_param: helm_deploy_delay }
+ __use_ramdisk__: { get_param: use_ramdisk }
__public_net_id__: { get_param: public_net_id }
__oam_network_cidr__: { get_param: oam_network_cidr }
__oam_network_id__: { get_resource: oam_network }
__oam_subnet_id__: { get_resource: oam_subnet }
__sec_group__: { get_resource: onap_sg }
- __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] }
+ __k8s_01_vm_ip__: { get_attr: [k8s_01_floating_ip, floating_ip_address] }
__k8s_vm_ips__: [
EOF
-for VM_NUM in $(seq $NUM_K8S_VMS); do
+for VM_NUM in $(seq -f %02g $NUM_K8S_VMS); do
K8S_VM_NAME=k8s_$VM_NUM
cat <<EOF
get_attr: [${K8S_VM_NAME}_floating_ip, floating_ip_address],
@@ -82,7 +84,7 @@ cat <<EOF
__k8s_private_ips__: [
EOF
-for VM_NUM in $(seq $NUM_K8S_VMS); do
+for VM_NUM in $(seq -f %02g $NUM_K8S_VMS); do
K8S_VM_NAME=k8s_$VM_NUM
cat <<EOF
get_attr: [${K8S_VM_NAME}_floating_ip, fixed_ip_address],
@@ -93,7 +95,7 @@ cat <<EOF
]
EOF
-for VM_NUM in $(seq $NUM_K8S_VMS); do
+for VM_NUM in $(seq -f %02g $NUM_K8S_VMS); do
VM_TYPE=k8s HOST_LABEL=compute VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
done
@@ -108,7 +110,7 @@ done
cat $PARTS_DIR/onap-oom-3.yaml
-for VM_NUM in $(seq $NUM_K8S_VMS); do
+for VM_NUM in $(seq -f %02g $NUM_K8S_VMS); do
K8S_VM_NAME=k8s_$VM_NUM
cat <<EOF
${K8S_VM_NAME}_vm_ip: