diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2018-02-08 18:08:32 -0800 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2018-02-09 10:53:09 -0800 |
| commit | 50a5371ecd17f03089df1d2142b5479e86cd6479 (patch) | |
| tree | 3c8ea4e0ce0c6cf2ecd06c1058860abfaac78f99 /tools/cloudify | |
| parent | 2cbdcfde1374b934ee19af4335ae22b13684b294 (diff) | |
Wait for homestead-prov to be deleted before redeploying
JIRA: MODELS-2
Correct retrieval of node_port from cloudify
Change-Id: Idf510667988050d586c72a4d8642aeb2803bef55
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'tools/cloudify')
| -rw-r--r-- | tools/cloudify/k8s-cloudify.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tools/cloudify/k8s-cloudify.sh b/tools/cloudify/k8s-cloudify.sh index 51d3558..b3780ae 100644 --- a/tools/cloudify/k8s-cloudify.sh +++ b/tools/cloudify/k8s-cloudify.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 AT&T Intellectual Property, Inc +# Copyright 2017-2018 AT&T Intellectual Property, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -268,20 +268,7 @@ function node_port() { while [[ "$nodePort" == "null" && $tries -gt 0 ]]; do curl -s -u admin:admin --header 'Tenant: default_tenant' \ -o ~/tmp/json http://$k8s_master/api/v3.1/node-instances - ni=$(jq -r '.items | length' ~/tmp/json) - while [[ $ni -ge 0 ]]; do - ((ni--)) - depid=$(jq -r ".items[$ni].deployment_id" ~/tmp/json) - type=$(jq -r ".items[$ni].runtime_properties.kubernetes.kind" ~/tmp/json) - if [[ "$depid" == "$name" && "$type" == "Service" ]]; then - svcId=$ni - nodePort=$(jq -r ".items[$ni].runtime_properties.kubernetes.spec.ports[0].node_port" ~/tmp/json) - if [[ "$nodePort" != "null" ]]; then - echo "nodePort=$nodePort" - export nodePort - fi - fi - done + nodePort=$(cat tmp/json | jq -r ".items[] | select(.node_id == \"${name}_service\")" | jq -r '.runtime_properties.kubernetes.spec.ports[0].node_port') sleep 10 ((tries--)) done |