aboutsummaryrefslogtreecommitdiffstats
path: root/tools/performance/cloud/configure-consul.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/performance/cloud/configure-consul.sh')
-rwxr-xr-xtools/performance/cloud/configure-consul.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/tools/performance/cloud/configure-consul.sh b/tools/performance/cloud/configure-consul.sh
index 3ab298e8..1465a5ff 100755
--- a/tools/performance/cloud/configure-consul.sh
+++ b/tools/performance/cloud/configure-consul.sh
@@ -18,15 +18,17 @@
# ============LICENSE_END=========================================================
SSL=$1
+CERT_PATH=/etc/ves-hv/ssl
+ONAP_NAMESPACE=onap
if [ "$SSL" != "true" ] && [ "$SSL" != "false" ] ; then
SSL=true
+elif [ "$SSL" = "false" ] ; then
+ CERT_PATH=/etc/ves-hv/ssl/server
fi
-IP=$(kubectl config view -o jsonpath='{.clusters[].cluster.server}')
-HTTPS="https://"
-IP=${IP[@]//${HTTPS}}
-IP=${IP[@]//:*}
-STATUS=$(curl -s --header "Content-Type: application/json" \
+HVVES_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep hv-ves-collector)
+
+STATUS=$(kubectl exec -n onap ${HVVES_POD_NAME} --container=dcae-hv-ves-collector -- curl -s --header "Content-Type: application/json" \
--request PUT \
--data '{"security.sslDisable": '${SSL}',
"logLevel": "INFO",
@@ -46,11 +48,11 @@ STATUS=$(curl -s --header "Content-Type: application/json" \
}
}
},
-"security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
-"security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
-"security.keys.trustStorePasswordFile":"/etc/ves-hv/ssl/trust.pass",
-"security.keys.keyStorePasswordFile": "/etc/ves-hv/ssl/server.pass"}' \
-${IP}:30270/v1/kv/dcae-hv-ves-collector?dc=dc1&token=)
+"security.keys.trustStoreFile": "'${CERT_PATH}'/trust.p12",
+"security.keys.keyStoreFile": "'${CERT_PATH}'/server.p12",
+"security.keys.trustStorePasswordFile":"'${CERT_PATH}'/trust.pass",
+"security.keys.keyStorePasswordFile": "'${CERT_PATH}'/server.pass"}' \
+consul-server.onap:8500/v1/kv/dcae-hv-ves-collector?dc=dc1&token=)
if [ "$STATUS" = "true" ] ; then
if [ "$SSL" = "true" ] ; then
@@ -58,4 +60,4 @@ if [ "$STATUS" = "true" ] ; then
else
echo "SSL turned on"
fi
-fi \ No newline at end of file
+fi