summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorJeff Cantrill <jcantril@redhat.com>2017-01-30 10:42:58 -0500
committerJeff Cantrill <jcantril@redhat.com>2017-01-30 11:13:02 -0500
commit771699023ddaa5a30f787fa61a368df3c3826a29 (patch)
tree23ae899c50d0ff8fc75c2f17a45b1736f57b8826 /roles/openshift_logging/tasks
parente11ecff826aba160fee68c35f954eb86f92d670f (diff)
downloadopenshift-771699023ddaa5a30f787fa61a368df3c3826a29.tar.gz
openshift-771699023ddaa5a30f787fa61a368df3c3826a29.tar.bz2
openshift-771699023ddaa5a30f787fa61a368df3c3826a29.tar.xz
openshift-771699023ddaa5a30f787fa61a368df3c3826a29.zip
fix negative stride encountered from openshift_logging
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/install_elasticsearch.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml
index d12811d56..64e983557 100644
--- a/roles/openshift_logging/tasks/install_elasticsearch.yaml
+++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml
@@ -17,13 +17,13 @@
# This should be used to generate new DC names if necessary
- name: Create new DeploymentConfig names for Elasticsearch
- set_fact: es_dc_pool={{es_dc_pool + [deploy_name]}}
+ set_fact: es_dc_pool={{es_dc_pool|default([]) + [deploy_name]}}
vars:
component: es
es_cluster_name: "{{component}}"
deploy_name_prefix: "logging-{{component}}"
deploy_name: "{{deploy_name_prefix}}-{{'abcdefghijklmnopqrstuvwxyz0123456789'|random_word(8)}}"
- with_sequence: count={{ openshift_logging_current_es_size | int - openshift_logging_es_cluster_size | int }}
+ with_sequence: count={{ openshift_logging_es_cluster_size | int - openshift_logging_current_es_size | int }}
check_mode: no
- name: Generate Elasticsearch DeploymentConfig
@@ -83,14 +83,14 @@
- openshift_logging_use_ops
- name: Create new DeploymentConfig names for Elasticsearch Ops
- set_fact: es_ops_dc_pool={{es_ops_dc_pool + [deploy_name]}}
+ set_fact: es_ops_dc_pool={{es_ops_dc_pool | default([]) + [deploy_name]}}
vars:
component: es-ops
es_cluster_name: "{{component}}"
deploy_name_prefix: "logging-{{component}}"
deploy_name: "{{deploy_name_prefix}}-{{'abcdefghijklmnopqrstuvwxyz0123456789'|random_word(8)}}"
cluster_size: "{{openshift_logging_es_ops_cluster_size}}"
- with_sequence: count={{ openshift_logging_current_es_ops_size | int - openshift_logging_es_ops_cluster_size | int }}
+ with_sequence: count={{ openshift_logging_es_ops_cluster_size | int - openshift_logging_current_es_ops_size | int }}
when:
- openshift_logging_use_ops
check_mode: no