diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-05-11 14:30:41 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-05-22 10:42:54 -0500 |
| commit | 27cd17a5b41c1cc93dbd84c12f571aa176f99ed2 (patch) | |
| tree | bf7ff44defaa2cec2880cc93cacf778e4eaab879 | |
| parent | f204d6a0cb6f7e56e0ca9e62e9f329f815ebe816 (diff) | |
| download | openshift-27cd17a5b41c1cc93dbd84c12f571aa176f99ed2.tar.gz openshift-27cd17a5b41c1cc93dbd84c12f571aa176f99ed2.tar.bz2 openshift-27cd17a5b41c1cc93dbd84c12f571aa176f99ed2.tar.xz openshift-27cd17a5b41c1cc93dbd84c12f571aa176f99ed2.zip | |
fixing available variables for 2.3.0
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index da00ba34d..536d1281d 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -52,6 +52,10 @@ - set_fact: es_indices={{ es_indices | default([]) + [item | int - 1] }} with_sequence: count={{ openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count }} + when: openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count > 0 + +- set_fact: es_indices=[] + when: openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count == 0 # TODO: add more vars # We don't allow scaling down of ES nodes currently @@ -94,6 +98,10 @@ with_sequence: count={{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count }} when: - openshift_logging_use_ops | bool + - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count > 0 + +- set_fact: es_ops_indices=[] + when: openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count == 0 # TODO: add more vars - include_role: |