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/tasks/import_jks_certs.yaml | |
| 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/tasks/import_jks_certs.yaml')
| -rw-r--r-- | roles/openshift_metrics/tasks/import_jks_certs.yaml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/roles/openshift_metrics/tasks/import_jks_certs.yaml b/roles/openshift_metrics/tasks/import_jks_certs.yaml index 57ec70c79..2a67dad0e 100644 --- a/roles/openshift_metrics/tasks/import_jks_certs.yaml +++ b/roles/openshift_metrics/tasks/import_jks_certs.yaml @@ -15,10 +15,6 @@ register: metrics_truststore check_mode: no -- stat: path="{{mktemp.stdout}}/hawkular-jgroups.keystore" - register: jgroups_keystore - check_mode: no - - block: - slurp: src={{ mktemp.stdout }}/hawkular-metrics-keystore.pwd register: metrics_keystore_password @@ -26,9 +22,6 @@ - slurp: src={{ mktemp.stdout }}/hawkular-cassandra-keystore.pwd register: cassandra_keystore_password - - slurp: src={{ mktemp.stdout }}/hawkular-jgroups-keystore.pwd - register: jgroups_keystore_password - - fetch: dest: "{{local_tmp.stdout}}/" src: "{{ mktemp.stdout }}/{{item}}" @@ -48,7 +41,6 @@ CASSANDRA_KEYSTORE_PASSWD: "{{cassandra_keystore_password.content}}" METRICS_TRUSTSTORE_PASSWD: "{{hawkular_truststore_password.content}}" CASSANDRA_TRUSTSTORE_PASSWD: "{{cassandra_truststore_password.content}}" - JGROUPS_PASSWD: "{{jgroups_keystore_password.content}}" changed_when: False - copy: @@ -59,5 +51,4 @@ when: not metrics_keystore.stat.exists or not metrics_truststore.stat.exists or not cassandra_keystore.stat.exists or - not cassandra_truststore.stat.exists or - not jgroups_keystore.stat.exists + not cassandra_truststore.stat.exists |