summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2017-12-07 07:09:49 -0800
committerBryan Sullivan <bryan.sullivan@att.com>2017-12-07 07:09:49 -0800
commit55afc75ae4f265bc74a1777d5f04ff4d17577266 (patch)
tree7019cfd4ca750617b051f308a1dd4fed151c072b
parentc61b1a6fabdd8820f93dedaee244c66da1a0a6e7 (diff)
Fix a couple of bugs
JIRA: MODELS-2 Change-Id: I5fd2735f420e77728747511e2862f36aa6d616b4 Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
-rw-r--r--tools/kubernetes/ceph-helm.sh3
-rw-r--r--tools/kubernetes/demo_deploy.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/kubernetes/ceph-helm.sh b/tools/kubernetes/ceph-helm.sh
index 084a4f7..9308514 100644
--- a/tools/kubernetes/ceph-helm.sh
+++ b/tools/kubernetes/ceph-helm.sh
@@ -178,7 +178,7 @@ EOG
for node in $nodes; do
name=$(ssh -x -o StrictHostKeyChecking=no $USER@$node hostname)
pod=$(kubectl get pods --namespace ceph | awk "/$name/{print \$1}")
- while "$pod" == "" ; do
+ while [[ "$pod" == "" ]]; do
log "ceph-osd pod not yet created at node $name, waiting 10 seconds"
kubectl get pods --namespace ceph
sleep 10
@@ -193,6 +193,7 @@ EOG
status=$(kubectl get pods --namespace ceph $pod | awk "/$pod/ {print \$3}")
kubectl get pods --namespace ceph
done
+ log "$pod status is $status."
done
log "WORKAROUND take ownership of .kube"
diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh
index 61adaa2..b285198 100644
--- a/tools/kubernetes/demo_deploy.sh
+++ b/tools/kubernetes/demo_deploy.sh
@@ -165,6 +165,6 @@ port=$( bash ~/models/tools/cloudify/k8s-cloudify.sh port nginx $k8s_master)
echo "Cloudify-deployed demo app nginx is available at http://$k8s_master:$port"
echo "Prometheus UI is available at http://$k8s_master:9090"
echo "Grafana dashboards are available at http://$ves_grafana_host (login as $ves_grafana_auth)"
-echo "Grafana API is available at http://$ves_grafana_auth@$ves_influx_host/api/v1/query?query=<string>"
+echo "Grafana API is available at http://$ves_grafana_auth@$ves_grafana_host/api/v1/query?query=<string>"
echo "Kubernetes API is available at https://$k8s_master:6443/api/v1/"
echo "Cloudify API access example: curl -u admin:admin --header 'Tenant: default_tenant' http://$k8s_master/api/v3.1/status"