diff options
Diffstat (limited to 'deployment/heat')
| -rw-r--r-- | deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env | 4 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env | 4 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index 843e00618..daa145a86 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -14,8 +14,8 @@ parameters: apt_proxy: 192.168.31.204:3142 docker_proxy: 192.168.31.204:5000 - rancher_vm_flavor: m1.large - k8s_vm_flavor: m2.xxlarge + rancher_vm_flavor: m2.large + k8s_vm_flavor: m5.xxlarge public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9 public_net_name: admin-vpn-floating diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index 2b54be772..cbda112f7 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -14,8 +14,8 @@ parameters: apt_proxy: 192.168.31.204:3142 docker_proxy: 192.168.31.204:5000 - rancher_vm_flavor: m1.large - k8s_vm_flavor: m2.xxlarge + rancher_vm_flavor: m2.large + k8s_vm_flavor: m5.xxlarge public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9 public_net_name: admin-vpn-floating diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index c81e65c8b..056174d28 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -19,8 +19,8 @@ for n in $(seq 1 5); do envsubst < $ENV_FILE > $ENV_FILE~ openstack stack create -t ./onap-oom.yaml -e $ENV_FILE~ onap-oom - for i in $(seq 1 10); do - sleep 10 + for i in $(seq 1 30); do + sleep 30 K8S_IP=$(openstack stack output show onap-oom k8s_vm_ip -c output_value -f value) RANCHER_IP=$(openstack stack output show onap-oom rancher_vm_ip -c output_value -f value) timeout 1 ping -c 1 "$K8S_IP" && timeout 1 ping -c 1 "$RANCHER_IP" && break @@ -38,7 +38,7 @@ fi ssh-keygen -R $K8S_IP for n in $(seq 1 10); do - timeout 2m ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$K8S_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' + timeout 15m ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$K8S_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break |