From c6d48d91722384b92dcaf4749de2b0621b7102a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Tue, 14 Feb 2017 17:38:22 +0100
Subject: Removed JGroups cert and password generation.

---
 roles/openshift_metrics/files/import_jks_certs.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'roles/openshift_metrics/files')

diff --git a/roles/openshift_metrics/files/import_jks_certs.sh b/roles/openshift_metrics/files/import_jks_certs.sh
index f4315ef34..c8d5bb3d2 100755
--- a/roles/openshift_metrics/files/import_jks_certs.sh
+++ b/roles/openshift_metrics/files/import_jks_certs.sh
@@ -24,11 +24,10 @@ function import_certs() {
   hawkular_cassandra_keystore_password=$(echo $CASSANDRA_KEYSTORE_PASSWD | base64 -d)
   hawkular_metrics_truststore_password=$(echo $METRICS_TRUSTSTORE_PASSWD | base64 -d)
   hawkular_cassandra_truststore_password=$(echo $CASSANDRA_TRUSTSTORE_PASSWD | base64 -d)
-  hawkular_jgroups_password=$(echo $JGROUPS_PASSWD | base64 -d)
-  
+
   cassandra_alias=`keytool -noprompt -list -keystore $dir/hawkular-cassandra.truststore -storepass ${hawkular_cassandra_truststore_password} | sed -n '7~2s/,.*$//p'`
   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
     echo "Creating the Hawkular Metrics keystore from the PEM file"
     keytool -importkeystore -v \
@@ -50,7 +49,7 @@ function import_certs() {
       -srcstorepass $hawkular_cassandra_keystore_password \
       -deststorepass $hawkular_cassandra_keystore_password
   fi
-  
+
   if [[ ! ${cassandra_alias[*]} =~ hawkular-metrics ]]; then
     echo "Importing the Hawkular Certificate into the Cassandra Truststore"
     keytool -noprompt -import -v -trustcacerts -alias hawkular-metrics \
@@ -59,7 +58,7 @@ function import_certs() {
       -trustcacerts \
       -storepass $hawkular_cassandra_truststore_password
   fi
-  
+
   if [[ ! ${hawkular_alias[*]} =~ hawkular-cassandra ]]; then
     echo "Importing the Cassandra Certificate into the Hawkular Truststore"
     keytool -noprompt -import -v -trustcacerts -alias hawkular-cassandra \
@@ -101,16 +100,6 @@ function import_certs() {
         -storepass $hawkular_metrics_truststore_password
     fi
   done
-
-  if [ ! -f $dir/hawkular-jgroups.keystore ]; then
-    echo "Generating the jgroups keystore"
-    keytool -genseckey -alias hawkular -keypass ${hawkular_jgroups_password} \
-      -storepass ${hawkular_jgroups_password} \
-      -keyalg Blowfish \
-      -keysize 56 \
-      -keystore $dir/hawkular-jgroups.keystore \
-      -storetype JCEKS
-  fi
 }
 
 import_certs
-- 
cgit v1.2.3