summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-30 20:24:07 -0500
committerGitHub <noreply@github.com>2017-03-30 20:24:07 -0500
commit6051550cb8796080fd44e39b059bca7d2453dce8 (patch)
tree303518fa6228e2c1b7f1c2562b21489d2dbf4f31 /roles
parent1f922786305162fc9465a733e744ee440e50f70b (diff)
parent81400b0030d931d2e75578e1edc693c0c40ff7b3 (diff)
downloadopenshift-6051550cb8796080fd44e39b059bca7d2453dce8.tar.gz
openshift-6051550cb8796080fd44e39b059bca7d2453dce8.tar.bz2
openshift-6051550cb8796080fd44e39b059bca7d2453dce8.tar.xz
openshift-6051550cb8796080fd44e39b059bca7d2453dce8.zip
Merge pull request #3809 from stobias123/metrics-decode-syntax
Merged by openshift-bot
Diffstat (limited to 'roles')
-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