diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-27 07:14:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 07:14:06 -0700 |
| commit | cc161d1b79f53b7daa4837f9fc262455cf04a4f4 (patch) | |
| tree | 6bf4c8ae2c3acf00f1cf9c4c4db50f6b3278db35 | |
| parent | 49858c9ce01ae139dc4c6e0592e4fb3a1875ba2d (diff) | |
| parent | 22683f6f71aa0380494d0de22a18826d5e37ca51 (diff) | |
| download | openshift-cc161d1b79f53b7daa4837f9fc262455cf04a4f4.tar.gz openshift-cc161d1b79f53b7daa4837f9fc262455cf04a4f4.tar.bz2 openshift-cc161d1b79f53b7daa4837f9fc262455cf04a4f4.tar.xz openshift-cc161d1b79f53b7daa4837f9fc262455cf04a4f4.zip | |
Merge pull request #5546 from ewolinetz/bz1495203
Automatic merge from submit-queue
Adding default for volume size if not set
Adds default for volume size if not provided but setting the storage kind
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1495203
https://github.com/openshift/openshift-ansible/issues/5525
This should go in after https://github.com/openshift/openshift-ansible/pull/5543
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml b/roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml index e52ab5f6d..e534e0cca 100644 --- a/roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml +++ b/roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml @@ -35,10 +35,10 @@ - set_fact: openshift_logging_elasticsearch_pvc_dynamic: "{{ 'true' if openshift_logging_storage_kind | default(none) == 'dynamic' else '' }}" - openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_storage_volume_size if openshift_logging_storage_kind | default(none) in ['dynamic','nfs'] else '' }}" + openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_storage_volume_size | default('10Gi') if openshift_logging_storage_kind | default(none) in ['dynamic','nfs'] else '' }}" openshift_logging_elasticsearch_pvc_prefix: "{{ 'logging-es' if openshift_logging_storage_kind | default(none) == 'dynamic' else '' }}" openshift_logging_elasticsearch_ops_pvc_dynamic: "{{ 'true' if openshift_loggingops_storage_kind | default(none) == 'dynamic' else '' }}" - openshift_logging_elasticsearch_ops_pvc_size: "{{ openshift_loggingops_storage_volume_size if openshift_loggingops_storage_kind | default(none) in ['dynamic','nfs'] else '' }}" + openshift_logging_elasticsearch_ops_pvc_size: "{{ openshift_loggingops_storage_volume_size | default('10Gi') if openshift_loggingops_storage_kind | default(none) in ['dynamic','nfs'] else '' }}" openshift_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_loggingops_storage_kind | default(none) == 'dynamic' else '' }}" openshift_logging_curator_nodeselector: "{{ openshift_hosted_logging_curator_nodeselector | default('') | map_from_pairs }}" openshift_logging_curator_ops_nodeselector: "{{ openshift_hosted_logging_curator_ops_nodeselector | default('') | map_from_pairs }}" |