From 8aff1241523a1c35c7cfa913a045af62eb34ee8f Mon Sep 17 00:00:00 2001 From: Eric Wolinetz Date: Fri, 26 Jan 2018 12:03:04 -0600 Subject: No longer compare with legacy hosted var --- roles/openshift_logging/tasks/install_logging.yaml | 4 ++-- 1 file 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 -- cgit v1.2.3