summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2017-10-31 13:31:03 -0700
committerBryan Sullivan <bryan.sullivan@att.com>2017-10-31 13:31:03 -0700
commit14cad79fc39fafa942f07f8b4c5c671c33b7a427 (patch)
treeb05cecaac3eec7881753e35d19862f733ac7c449
parent63533a0058f9e313dbd818fceb5551813f0a8950 (diff)
Reference correct test job etc
JIRA: MODELS-23 Change-Id: I3e1ef1dc9f24fa0f34abe1fb8eedb9ff49475895 Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
-rw-r--r--tools/kubernetes/ceph-helm.sh6
-rw-r--r--tools/kubernetes/demo_deploy.sh1
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/kubernetes/ceph-helm.sh b/tools/kubernetes/ceph-helm.sh
index 73a32b0..4660881 100644
--- a/tools/kubernetes/ceph-helm.sh
+++ b/tools/kubernetes/ceph-helm.sh
@@ -146,10 +146,10 @@ EOG
log "Attach the pvc to a job and check if the job is successful (i.e., 1)"
kubectl create -f tests/ceph/job.yaml
- status=$(kubectl get jobs ceph-secret-generator -n ceph -o json | jq -r '.status.succeeded')
+ status=$(kubectl get jobs ceph-test-job -n default -o json | jq -r '.status.succeeded')
if [[ "$status" != "1" ]]; then
log "pvc attachment was not successful:"
- kubectl get jobs ceph-secret-generator -n ceph -o json
+ kubectl get jobs ceph-test-job -n default -o json
exit 1
fi
@@ -164,7 +164,7 @@ EOG
done
log "test job succeeded"
- kubectl delete jobs ceph-secret-generator -n ceph
+ kubectl delete jobs ceph-test-job -n default
kubectl delete pvc ceph-test
log "Ceph setup complete!"
}
diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh
index 7489622..6aa45dc 100644
--- a/tools/kubernetes/demo_deploy.sh
+++ b/tools/kubernetes/demo_deploy.sh
@@ -97,3 +97,4 @@ echo "Cloudify-deployed demo app nginx is available at TBD"
echo "Prometheus UI is available at http://$master:9090"
echo "Grafana dashboards are available at http://$master:3000 (login as admin/admin)"
echo "Grafana API is available at http://admin:admin@$master:3000/api/v1/query?query=<string>"
+echo "Kubernetes API is available at https://$master:6443/api/v1/"