diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-05-24 20:54:28 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-05-24 20:54:28 -0700 |
| commit | 0d28fe6e20d46380a25ac7e17a01b11cabe63db4 (patch) | |
| tree | 4dc857e5adda27905af911c2d531e7fd32a011d9 | |
| parent | 5929ca1b5fe0f5ece03c36f793f483db1a6aa90b (diff) | |
Bug fix on OOM deploy script
Change-Id: I869f9eeb112f0b9516dc0c33874a26f35684a156
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 3dbc0894d..98ba2bd6a 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -10,6 +10,8 @@ if [ "$#" -ne 1 ]; then fi ENV_FILE=$1 +SSH_KEY=~/.ssh/onap_key + source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f @@ -54,17 +56,17 @@ fi ssh-keygen -R $RANCHER_IP -ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" +ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" for n in $(seq 1 6); do - timeout 15m ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' + timeout 15m ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break fi sleep 15m done -ROBOT_POD=$(ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') +ROBOT_POD=$(ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') if [ "$ROBOT_POD" == "" ]; then exit 1 fi |