Browse Source

Merge pull request #3809 from stobias123/metrics-decode-syntax

Merged by openshift-bot
OpenShift Bot 8 years ago
parent
commit
6051550cb8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      roles/openshift_metrics/files/import_jks_certs.sh

+ 2 - 2
roles/openshift_metrics/files/import_jks_certs.sh

@@ -20,8 +20,8 @@ set -ex
 
 function import_certs() {
   dir=$CERT_DIR
-  hawkular_metrics_keystore_password=$(echo $METRICS_KEYSTORE_PASSWD | base64 -d)
-  hawkular_metrics_truststore_password=$(echo $METRICS_TRUSTSTORE_PASSWD | base64 -d)
+  hawkular_metrics_keystore_password=$(echo $METRICS_KEYSTORE_PASSWD | base64 --decode)
+  hawkular_metrics_truststore_password=$(echo $METRICS_TRUSTSTORE_PASSWD | base64 --decode)
   hawkular_alias=`keytool -noprompt -list -keystore $dir/hawkular-metrics.truststore -storepass ${hawkular_metrics_truststore_password} | sed -n '7~2s/,.*$//p'`
 
   if [ ! -f $dir/hawkular-metrics.keystore ]; then