diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-30 13:00:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 13:00:51 -0600 |
| commit | af6471238378cc03979f7e003838795d6f2f3392 (patch) | |
| tree | 7e8ddc5cf3c1e4c2fc8dd35c0bee115b313ef9ab /roles/openshift_logging | |
| parent | 8c7ccc601cab2f84a1fa3af9f4c1278dab96daf5 (diff) | |
| parent | 771699023ddaa5a30f787fa61a368df3c3826a29 (diff) | |
| download | openshift-af6471238378cc03979f7e003838795d6f2f3392.tar.gz openshift-af6471238378cc03979f7e003838795d6f2f3392.tar.bz2 openshift-af6471238378cc03979f7e003838795d6f2f3392.tar.xz openshift-af6471238378cc03979f7e003838795d6f2f3392.zip | |
Merge pull request #3219 from jcantrill/fix_logging_neg_stride
fix negative stride encountered from openshift_logging
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 8 |
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 |