summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks/install_logging.yaml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-27 18:10:27 -0500
committerGitHub <noreply@github.com>2017-01-27 18:10:27 -0500
commit9231620fc6007b2c35f859929f67242954d0d77e (patch)
tree9a353ef20b19f39ea792b69962dc8ffb01e07fbc /roles/openshift_logging/tasks/install_logging.yaml
parentd1f121ceb38c09d77a9ee1572a6ff9f3b5a12d98 (diff)
parente74014e76be5b5eef6fe8ad639dc63913703b53b (diff)
downloadopenshift-9231620fc6007b2c35f859929f67242954d0d77e.tar.gz
openshift-9231620fc6007b2c35f859929f67242954d0d77e.tar.bz2
openshift-9231620fc6007b2c35f859929f67242954d0d77e.tar.xz
openshift-9231620fc6007b2c35f859929f67242954d0d77e.zip
Merge pull request #3202 from ewolinetz/logging_fix_generating_es_dc
Updating to reuse previous ES DC names and always generate DCs
Diffstat (limited to 'roles/openshift_logging/tasks/install_logging.yaml')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index a9699adb8..8a33498cd 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -8,8 +8,12 @@
check_mode: no
- name: Validate Elasticsearch cluster size
- fail: msg="The openshift_logging_es_cluster_size may not be scaled down more than 1 less (or 0) the number of Elasticsearch nodes already deployed"
- when: "{{openshift_logging_facts.elasticsearch.deploymentconfigs | length - openshift_logging_es_cluster_size | abs > 1}}"
+ fail: msg="The openshift_logging_es_cluster_size may only be scaled down manually. Please see official documentation on how to do this."
+ when: openshift_logging_facts.elasticsearch.deploymentconfigs | length > openshift_logging_es_cluster_size
+
+- name: Validate Elasticsearch Ops cluster size
+ fail: msg="The openshift_logging_es_ops_cluster_size may only be scaled down manually. Please see official documentation on how to do this."
+ when: openshift_logging_facts.elasticsearch_ops.deploymentconfigs | length > openshift_logging_es_ops_cluster_size
- name: Install logging
include: "{{ role_path }}/tasks/install_{{ install_component }}.yaml"