From 7d081c4b321971cc499a4fc499ad1bbaceea823f Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Wed, 8 Feb 2017 15:26:48 -0500
Subject: bug 1419962. fix openshift_metrics pwd issue after reinstall where
 cassandra has incorrect pwd exception

---
 roles/openshift_metrics/tasks/import_jks_certs.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'roles/openshift_metrics/tasks/import_jks_certs.yaml')

diff --git a/roles/openshift_metrics/tasks/import_jks_certs.yaml b/roles/openshift_metrics/tasks/import_jks_certs.yaml
index 16fd8d9f8..57ec70c79 100644
--- a/roles/openshift_metrics/tasks/import_jks_certs.yaml
+++ b/roles/openshift_metrics/tasks/import_jks_certs.yaml
@@ -1,37 +1,37 @@
 ---
-- stat: path="{{openshift_metrics_certs_dir}}/hawkular-cassandra.keystore"
+- stat: path="{{mktemp.stdout}}/hawkular-cassandra.keystore"
   register: cassandra_keystore
   check_mode: no
 
-- stat: path="{{openshift_metrics_certs_dir}}/hawkular-cassandra.truststore"
+- stat: path="{{mktemp.stdout}}/hawkular-cassandra.truststore"
   register: cassandra_truststore
   check_mode: no
 
-- stat: path="{{openshift_metrics_certs_dir}}/hawkular-metrics.keystore"
+- stat: path="{{mktemp.stdout}}/hawkular-metrics.keystore"
   register: metrics_keystore
   check_mode: no
 
-- stat: path="{{openshift_metrics_certs_dir}}/hawkular-metrics.truststore"
+- stat: path="{{mktemp.stdout}}/hawkular-metrics.truststore"
   register: metrics_truststore
   check_mode: no
 
-- stat: path="{{openshift_metrics_certs_dir}}/hawkular-jgroups.keystore"
+- stat: path="{{mktemp.stdout}}/hawkular-jgroups.keystore"
   register: jgroups_keystore
   check_mode: no
 
 - block:
-  - slurp: src={{ openshift_metrics_certs_dir }}/hawkular-metrics-keystore.pwd
+  - slurp: src={{ mktemp.stdout }}/hawkular-metrics-keystore.pwd
     register: metrics_keystore_password
 
-  - slurp: src={{ openshift_metrics_certs_dir }}/hawkular-cassandra-keystore.pwd
+  - slurp: src={{ mktemp.stdout }}/hawkular-cassandra-keystore.pwd
     register: cassandra_keystore_password
 
-  - slurp: src={{ openshift_metrics_certs_dir }}/hawkular-jgroups-keystore.pwd
+  - slurp: src={{ mktemp.stdout }}/hawkular-jgroups-keystore.pwd
     register: jgroups_keystore_password
 
   - fetch:
       dest: "{{local_tmp.stdout}}/"
-      src: "{{ openshift_metrics_certs_dir }}/{{item}}"
+      src: "{{ mktemp.stdout }}/{{item}}"
       flat: yes
     changed_when: False
     with_items:
@@ -52,7 +52,7 @@
     changed_when: False
 
   - copy:
-      dest: "{{openshift_metrics_certs_dir}}/"
+      dest: "{{mktemp.stdout}}/"
       src: "{{item}}"
     with_fileglob: "{{local_tmp.stdout}}/*.*store"
 
-- 
cgit v1.2.3