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.

---
 .../tasks/generate_hawkular_certificates.yaml                | 12 +-----------
 roles/openshift_metrics/tasks/import_jks_certs.yaml          | 11 +----------
 2 files changed, 2 insertions(+), 21 deletions(-)

(limited to 'roles/openshift_metrics/tasks')

diff --git a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
index 9e7140bfa..61a240a33 100644
--- a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
+++ b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
@@ -24,7 +24,6 @@
   with_items:
   - hawkular-metrics.pwd
   - hawkular-metrics.htpasswd
-  - hawkular-jgroups-keystore.pwd
   changed_when: no
 
 - set_fact:
@@ -32,11 +31,10 @@
   with_items: "{{pwd_file_stat.results}}"
   changed_when: no
 
-- name: generate password for hawkular metrics and jgroups
+- name: generate password for hawkular metrics
   local_action: copy dest="{{ local_tmp.stdout}}/{{ item }}.pwd" content="{{ 15 | oo_random_word }}"
   with_items:
   - hawkular-metrics
-  - hawkular-jgroups-keystore
 
 - name: generate htpasswd file for hawkular metrics
   local_action: >
@@ -51,7 +49,6 @@
   with_items:
   - hawkular-metrics.pwd
   - hawkular-metrics.htpasswd
-  - hawkular-jgroups-keystore.pwd
 
 - include: import_jks_certs.yaml
 
@@ -69,8 +66,6 @@
   - hawkular-metrics-truststore.pwd
   - hawkular-metrics.pwd
   - hawkular-metrics.htpasswd
-  - hawkular-jgroups.keystore
-  - hawkular-jgroups-keystore.pwd
   - hawkular-cassandra.crt
   - hawkular-cassandra.pem
   - hawkular-cassandra.keystore
@@ -104,11 +99,6 @@
       hawkular-metrics.keystore.alias: "{{ 'hawkular-metrics'|b64encode }}"
       hawkular-metrics.htpasswd.file: >
         {{ hawkular_secrets['hawkular-metrics.htpasswd'] }}
-      hawkular-metrics.jgroups.keystore: >
-        {{ hawkular_secrets['hawkular-jgroups.keystore'] }}
-      hawkular-metrics.jgroups.keystore.password: >
-        {{ hawkular_secrets['hawkular-jgroups-keystore.pwd'] }}
-      hawkular-metrics.jgroups.alias: "{{ 'hawkular'|b64encode }}"
   when: name not in metrics_secrets.stdout_lines
   changed_when: no
 
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
-- 
cgit v1.2.3