Merge "Add setting up consul configuration to cloud performance test shell scripts"

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh
index f4445844..b9267a97 100755
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@ -68,6 +68,9 @@ function clean() {
     echo "Attempting to delete client certs secret"
     kubectl delete secret cert -n ${ONAP_NAMESPACE}
 
+    echo "Attempting to turn off SSL"
+    ./configure-consul.sh true
+
     echo "Environment clean up finished!"
 }
 
@@ -132,6 +135,9 @@ function setup_environment() {
     kubectl create secret generic cert --from-file=./client.p12 --from-file=./client.pass -n ${ONAP_NAMESPACE}
     cd ${SCRIPT_DIRECTORY}
 
+    echo "Turning on SSL"
+    ./configure-consul.sh false
+
     echo "Creating test properties ConfigMap from: $PROPERTIES_FILE"
     kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}