Browse Source

Only manual scale down being allowed now

ewolinetz 8 years ago
parent
commit
e74014e76b

+ 2 - 2
roles/openshift_logging/tasks/install_elasticsearch.yaml

@@ -23,7 +23,7 @@
     es_cluster_name: "{{component}}"
     deploy_name_prefix: "logging-{{component}}"
     deploy_name: "{{deploy_name_prefix}}-{{'abcdefghijklmnopqrstuvwxyz0123456789'|random_word(8)}}"
-  with_sequence: count={{(openshift_logging_es_cluster_size | int - openshift_logging_current_es_size | int) | abs}}
+  with_sequence: count={{ openshift_logging_current_es_size | int - openshift_logging_es_cluster_size | int }}
   check_mode: no
 
 - name: Generate Elasticsearch DeploymentConfig
@@ -90,7 +90,7 @@
     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_es_ops_cluster_size | int - openshift_logging_current_es_ops_size | int }}
+  with_sequence: count={{ openshift_logging_current_es_ops_size | int - openshift_logging_es_ops_cluster_size | int }}
   when:
     - openshift_logging_use_ops
   check_mode: no

+ 6 - 2
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"