summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks/install_elasticsearch.yaml
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-01-31 17:38:34 -0600
committerewolinetz <ewolinet@redhat.com>2017-01-31 17:38:34 -0600
commitfca1c828306729a4a248603c26ecd58743a50601 (patch)
tree23f90a7fed7c95e26ede389ca741102be7170d9a /roles/openshift_logging/tasks/install_elasticsearch.yaml
parent80c24368564e2b8328c63d21902f54cb3ea12c4d (diff)
downloadopenshift-fca1c828306729a4a248603c26ecd58743a50601.tar.gz
openshift-fca1c828306729a4a248603c26ecd58743a50601.tar.bz2
openshift-fca1c828306729a4a248603c26ecd58743a50601.tar.xz
openshift-fca1c828306729a4a248603c26ecd58743a50601.zip
Adding bool filter to when openshift_logging_use_ops evals and updating oc_apply to handle trying to update immutable fields
Diffstat (limited to 'roles/openshift_logging/tasks/install_elasticsearch.yaml')
-rw-r--r--roles/openshift_logging/tasks/install_elasticsearch.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml
index 64e983557..1d6e55e44 100644
--- a/roles/openshift_logging/tasks/install_elasticsearch.yaml
+++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml
@@ -56,7 +56,7 @@
es_dcs: "{{openshift_logging_facts.elasticsearch_ops.deploymentconfigs}}"
cluster_size: "{{openshift_logging_es_ops_cluster_size}}"
when:
- - openshift_logging_use_ops
+ - openshift_logging_use_ops | bool
- "{{es_dcs | length - openshift_logging_es_ops_cluster_size | abs > 1}}"
check_mode: no
@@ -71,7 +71,7 @@
openshift_logging_es_pvc_dynamic: "{{openshift_logging_es_ops_pvc_dynamic}}"
openshift_logging_es_pv_selector: "{{openshift_logging_es_ops_pv_selector}}"
when:
- - openshift_logging_use_ops
+ - openshift_logging_use_ops | bool
check_mode: no
- name: Init pool of DeploymentConfig names for Elasticsearch Ops
@@ -80,7 +80,7 @@
loop_control:
loop_var: deploy_name
when:
- - openshift_logging_use_ops
+ - openshift_logging_use_ops | bool
- name: Create new DeploymentConfig names for Elasticsearch Ops
set_fact: es_ops_dc_pool={{es_ops_dc_pool | default([]) + [deploy_name]}}
@@ -92,7 +92,7 @@
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 }}
when:
- - openshift_logging_use_ops
+ - openshift_logging_use_ops | bool
check_mode: no
- name: Generate Elasticsearch DeploymentConfig for Ops
@@ -116,6 +116,6 @@
with_indexed_items:
- "{{ es_ops_dc_pool | default([]) }}"
when:
- - openshift_logging_use_ops
+ - openshift_logging_use_ops | bool
check_mode: no
changed_when: no