summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Tobias <stobias@harborfreight.com>2017-03-30 11:41:15 -0700
committerSteven Tobias <stobias@harborfreight.com>2017-03-30 11:41:15 -0700
commit81400b0030d931d2e75578e1edc693c0c40ff7b3 (patch)
tree94cd1b7a0cc51d9f8dc40b4bf4c7945801061132
parent102db9c49a7b35bac0172c73c64b818d9d9a0024 (diff)
downloadopenshift-81400b0030d931d2e75578e1edc693c0c40ff7b3.tar.gz
openshift-81400b0030d931d2e75578e1edc693c0c40ff7b3.tar.bz2
openshift-81400b0030d931d2e75578e1edc693c0c40ff7b3.tar.xz
openshift-81400b0030d931d2e75578e1edc693c0c40ff7b3.zip
fixed decode switch so it works on OSX
-rwxr-xr-xroles/openshift_metrics/files/import_jks_certs.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_metrics/files/import_jks_certs.sh b/roles/openshift_metrics/files/import_jks_certs.sh
index b2537f448..f977b6dd6 100755
--- a/roles/openshift_metrics/files/import_jks_certs.sh
+++ b/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