summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2018-01-26 12:03:04 -0600
committerEric Wolinetz <ewolinet@redhat.com>2018-01-26 13:29:38 -0600
commit8aff1241523a1c35c7cfa913a045af62eb34ee8f (patch)
tree29a264dcda638ee6a572f127516a64b44aefc4aa /roles
parent69a55ec7548782476a75eab08be4265ff8c5186c (diff)
downloadopenshift-8aff1241523a1c35c7cfa913a045af62eb34ee8f.tar.gz
openshift-8aff1241523a1c35c7cfa913a045af62eb34ee8f.tar.bz2
openshift-8aff1241523a1c35c7cfa913a045af62eb34ee8f.tar.xz
openshift-8aff1241523a1c35c7cfa913a045af62eb34ee8f.zip
No longer compare with legacy hosted var
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 00613ba64..1b4bdb11f 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -80,7 +80,7 @@
elasticsearch_storage_type: openshift_logging_elasticsearch_storage_type
- set_fact:
- default_elasticsearch_storage_type: "{{ 'pvc' if ( openshift_logging_es_pvc_dynamic | bool or openshift_hosted_logging_storage_kind | default('') == 'nfs' or openshift_logging_es_pvc_size | length > 0) else 'emptydir' }}"
+ default_elasticsearch_storage_type: "{{ 'pvc' if ( openshift_logging_es_pvc_dynamic | bool or openshift_logging_storage_kind | default('') == 'nfs' or openshift_logging_es_pvc_size | length > 0) else 'emptydir' }}"
- include_role:
name: openshift_logging_elasticsearch
@@ -141,7 +141,7 @@
when: openshift_logging_es_ops_pvc_prefix == ""
- set_fact:
- default_elasticsearch_storage_type: "{{ 'pvc' if ( openshift_logging_es_ops_pvc_dynamic | bool or openshift_hosted_logging_storage_kind | default('') == 'nfs' or openshift_logging_es_ops_pvc_size | length > 0) else 'emptydir' }}"
+ default_elasticsearch_storage_type: "{{ 'pvc' if ( openshift_logging_es_ops_pvc_dynamic | bool or openshift_logging_storage_kind | default('') == 'nfs' or openshift_logging_es_ops_pvc_size | length > 0) else 'emptydir' }}"
when:
- openshift_logging_use_ops | bool