diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-15 13:23:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 13:23:13 -0400 |
| commit | 91ca8e8134bc0af84478125174c58f0fb2b8943c (patch) | |
| tree | ffc967d2d6764fb074fdff67bdd859380acd4bd3 /roles/openshift_logging/tasks/generate_secrets.yaml | |
| parent | 6362a2cc4e8dfa902f4e04c9b564d3933fbb755e (diff) | |
| parent | 290f703cc0341fcec66bc6ba8f0c05a1e02649b6 (diff) | |
| download | openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.gz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.bz2 openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.xz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.zip | |
Merge pull request #3629 from ewolinetz/logging_15_cherrypick
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks/generate_secrets.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_secrets.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/openshift_logging/tasks/generate_secrets.yaml b/roles/openshift_logging/tasks/generate_secrets.yaml index 0f8e7ae58..f396bcc6d 100644 --- a/roles/openshift_logging/tasks/generate_secrets.yaml +++ b/roles/openshift_logging/tasks/generate_secrets.yaml @@ -31,8 +31,6 @@ - fluentd loop_control: loop_var: component - when: secret_name not in openshift_logging_facts.{{component}}.secrets or - secret_keys | difference(openshift_logging_facts.{{component}}.secrets["{{secret_name}}"]["keys"]) | length != 0 check_mode: no changed_when: no @@ -50,8 +48,6 @@ kibana_key_file: "{{key_pairs | entry_from_named_pair('kibana_internal_key')| b64decode }}" kibana_cert_file: "{{key_pairs | entry_from_named_pair('kibana_internal_cert')| b64decode }}" server_tls_file: "{{key_pairs | entry_from_named_pair('server_tls')| b64decode }}" - when: secret_name not in openshift_logging_facts.kibana.secrets or - secret_keys | difference(openshift_logging_facts.kibana.secrets["{{secret_name}}"]["keys"]) | length != 0 check_mode: no changed_when: no @@ -66,8 +62,6 @@ secret_name: logging-elasticsearch 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 check_mode: no changed_when: no |