diff options
Diffstat (limited to 'deployment/heat/onap-oom/scripts')
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 3 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index e3acd3c95..8a41a78de 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -68,12 +68,13 @@ ssh-keygen -R $RANCHER_IP 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 + echo "Wait count $n of 6" + sleep 15m 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_KEY ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') if [ "$ROBOT_POD" == "" ]; then 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 23f969c6b..32ccfc55a 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -50,6 +50,9 @@ cat <<EOF __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } + __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_refspec__: { get_param: gerrit_refspec } + __docker_manifest__: { get_param: docker_manifest } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } |