summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-10 12:47:31 -0500
committerGitHub <noreply@github.com>2017-03-10 12:47:31 -0500
commit646195dd74f22c8f26da0f80b12ebd1955e9f511 (patch)
treec7418edff3090d833fd0b29930fd99d4afd09aae /roles/openshift_logging/tasks
parent32d20e7e52d843a51b4de2f576cc05a89d37c767 (diff)
parentbc3042fbb66f6a231056d665f2f82cdc6f6d4a3b (diff)
downloadopenshift-646195dd74f22c8f26da0f80b12ebd1955e9f511.tar.gz
openshift-646195dd74f22c8f26da0f80b12ebd1955e9f511.tar.bz2
openshift-646195dd74f22c8f26da0f80b12ebd1955e9f511.tar.xz
openshift-646195dd74f22c8f26da0f80b12ebd1955e9f511.zip
Merge pull request #3616 from richm/missing-searchguard.truststore
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/generate_secrets.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging/tasks/generate_secrets.yaml b/roles/openshift_logging/tasks/generate_secrets.yaml
index 81fac8b5e..0f8e7ae58 100644
--- a/roles/openshift_logging/tasks/generate_secrets.yaml
+++ b/roles/openshift_logging/tasks/generate_secrets.yaml
@@ -64,7 +64,7 @@
admin-ca={{generated_certs_dir}}/ca.crt admin.jks={{generated_certs_dir}}/system.admin.jks -o yaml
vars:
secret_name: logging-elasticsearch
- secret_keys: ["admin-cert", "searchguard.key", "admin-ca", "key", "truststore", "admin-key"]
+ secret_keys: ["admin-cert", "searchguard.key", "admin-ca", "key", "truststore", "admin-key", "searchguard.truststore"]
register: logging_es_secret
when: secret_name not in openshift_logging_facts.elasticsearch.secrets or
secret_keys | difference(openshift_logging_facts.elasticsearch.secrets["{{secret_name}}"]["keys"]) | length != 0