diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-27 09:40:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 09:40:25 -0500 |
| commit | 41ee91326a9f533396bc876d399d4e7c50c9ea38 (patch) | |
| tree | 1dd8bceb11ec848683a0c7998d0b2d529a25610c /roles/openshift_metrics/files | |
| parent | 641b7c93b1d5ce5388fce66d737704d00a83ec68 (diff) | |
| parent | c6d48d91722384b92dcaf4749de2b0621b7102a1 (diff) | |
| download | openshift-41ee91326a9f533396bc876d399d4e7c50c9ea38.tar.gz openshift-41ee91326a9f533396bc876d399d4e7c50c9ea38.tar.bz2 openshift-41ee91326a9f533396bc876d399d4e7c50c9ea38.tar.xz openshift-41ee91326a9f533396bc876d399d4e7c50c9ea38.zip | |
Merge pull request #3358 from jpkrohling/JPK-JGroups-ASYM-Password
Removed JGroups cert and password generation.
Diffstat (limited to 'roles/openshift_metrics/files')
| -rwxr-xr-x | roles/openshift_metrics/files/import_jks_certs.sh | 19 |
1 files changed, 4 insertions, 15 deletions
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 |