diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 16:47:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 16:47:42 -0400 |
| commit | be513254b49822c18509debbd944437d1f93b162 (patch) | |
| tree | dc308d2d316afa9bccc78216163a8279c88f2723 | |
| parent | 0fd6d3108977e5c1bfffacbda84b3d066787d2e8 (diff) | |
| parent | 2ad64aeaffa23854ecf96bd903f5a5a9f1284ee0 (diff) | |
| download | openshift-be513254b49822c18509debbd944437d1f93b162.tar.gz openshift-be513254b49822c18509debbd944437d1f93b162.tar.bz2 openshift-be513254b49822c18509debbd944437d1f93b162.tar.xz openshift-be513254b49822c18509debbd944437d1f93b162.zip | |
Merge pull request #5184 from jcantrill/bz1480878_default_logging_pvc_size
bug 1480878. Default pvc for logging
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 931846fdb..1e800b1d6 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -229,7 +229,7 @@ dest: "{{ tempdir }}/templates/logging-es-pvc.yml" vars: obj_name: "{{ openshift_logging_elasticsearch_pvc_name }}" - size: "{{ openshift_logging_elasticsearch_pvc_size }}" + size: "{{ (openshift_logging_elasticsearch_pvc_size | trim | length == 0) | ternary('10Gi', openshift_logging_elasticsearch_pvc_size) }}" access_modes: "{{ openshift_logging_elasticsearch_pvc_access_modes | list }}" pv_selector: "{{ openshift_logging_elasticsearch_pvc_pv_selector }}" storage_class_name: "{{ openshift_logging_elasticsearch_pvc_storage_class_name | default('', true) }}" @@ -243,7 +243,7 @@ dest: "{{ tempdir }}/templates/logging-es-pvc.yml" vars: obj_name: "{{ openshift_logging_elasticsearch_pvc_name }}" - size: "{{ openshift_logging_elasticsearch_pvc_size }}" + size: "{{ (openshift_logging_elasticsearch_pvc_size | trim | length == 0) | ternary('10Gi', openshift_logging_elasticsearch_pvc_size) }}" access_modes: "{{ openshift_logging_elasticsearch_pvc_access_modes | list }}" pv_selector: "{{ openshift_logging_elasticsearch_pvc_pv_selector }}" when: |