heketi PR 527

527.diff

diff --git a/tests/functional/TestKubeSmokeTest/run.sh b/tests/functional/TestKubeSmokeTest/run.sh
index cbc0890..c24b438 100755
--- a/tests/functional/TestKubeSmokeTest/run.sh
+++ b/tests/functional/TestKubeSmokeTest/run.sh
@@ -125,13 +125,13 @@ build_docker_file
 kubectl get nodes
 
 ./testHeketiRpc.sh; res=$?
+teardown
 
-if $res -ne 0 ; then
+if [ $res -ne 0 ] ; then
   exit $res
+fi
 
 # test the Kube Dynamic Provisioning interface
-teardown
-
 setup_minikube
 start_minikube
 
@@ -142,6 +142,7 @@ build_docker_file
 kubectl get nodes
 
 ./testHeketiMock.sh; res=$?
+teardown
 
-#teardown
 exit $res
+
diff --git a/tests/functional/TestKubeSmokeTest/test-heketi-deployment.json b/tests/functional/TestKubeSmokeTest/test-heketi-deployment.json
index f006ff4..2a19a64 100644
--- a/tests/functional/TestKubeSmokeTest/test-heketi-deployment.json
+++ b/tests/functional/TestKubeSmokeTest/test-heketi-deployment.json
@@ -28,14 +28,6 @@
                         "name": "heketi",
                         "env": [
                           {
-                            "name": "HEKETI_USER_KEY",
-                            "value": "My Secret"
-                          },
-                          {
-                            "name": "HEKETI_ADMIN_KEY",
-                            "value": "My Secret"
-                          },
-                          {
                             "name": "HEKETI_EXECUTOR",
                             "value": "kubernetes"
                           },
@@ -45,7 +37,7 @@
                           },
                           {
                             "name": "HEKETI_KUBE_TOKENFILE",
-                            "value": "/var/lib/heketi/secret"
+                            "value": "/var/lib/heketi/secret/token"
                           },
                           {
                             "name": "HEKETI_FSTAB",
@@ -56,22 +48,10 @@
                             "value": "14"
                           },
                           {
-                            "name": "HEKETI_KUBE_CERTFILE",
-                            "value": "${HEKETI_KUBE_CERTFILE}"
-                          },
-                          {
                             "name": "HEKETI_KUBE_INSECURE",
                             "value": "y"
                           },
                           {
-                            "name": "HEKETI_KUBE_USER",
-                            "value": "${HEKETI_KUBE_USER}"
-                          },
-                          {
-                            "name": "HEKETI_KUBE_PASSWORD",
-                            "value": "${HEKETI_KUBE_PASSWORD}"
-                          },
-                          {
                             "name": "HEKETI_KUBE_NAMESPACE",
                             "value": "default"
                           },