diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-10 16:55:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 16:55:07 -0500 |
| commit | 39d078c8b1a17f3e4b827f9962a9f317a6464f3e (patch) | |
| tree | fce109e9b1af7e588e9ab1784afc34556bacf161 /roles/openshift_logging/templates | |
| parent | 6ac067c925dcf0561340297a4e2407392ecd6805 (diff) | |
| parent | 5e952859247d28abe6d5efb794ff6a1f8639000d (diff) | |
| download | openshift-39d078c8b1a17f3e4b827f9962a9f317a6464f3e.tar.gz openshift-39d078c8b1a17f3e4b827f9962a9f317a6464f3e.tar.bz2 openshift-39d078c8b1a17f3e4b827f9962a9f317a6464f3e.tar.xz openshift-39d078c8b1a17f3e4b827f9962a9f317a6464f3e.zip | |
Merge pull request #3596 from jcantrill/bz1428249_hostmount_fix
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/templates')
4 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_logging/templates/es-storage-emptydir.partial b/roles/openshift_logging/templates/es-storage-emptydir.partial new file mode 100644 index 000000000..ccd01a816 --- /dev/null +++ b/roles/openshift_logging/templates/es-storage-emptydir.partial @@ -0,0 +1 @@ + emptyDir: {} diff --git a/roles/openshift_logging/templates/es-storage-hostpath.partial b/roles/openshift_logging/templates/es-storage-hostpath.partial new file mode 100644 index 000000000..07ddad9ba --- /dev/null +++ b/roles/openshift_logging/templates/es-storage-hostpath.partial @@ -0,0 +1,2 @@ + hostPath: + path: {{es_storage['path']}} diff --git a/roles/openshift_logging/templates/es-storage-pvc.partial b/roles/openshift_logging/templates/es-storage-pvc.partial new file mode 100644 index 000000000..fcbff68de --- /dev/null +++ b/roles/openshift_logging/templates/es-storage-pvc.partial @@ -0,0 +1,2 @@ + persistentVolumeClaim: + claimName: {{es_storage['pvc_claim']}} diff --git a/roles/openshift_logging/templates/es.j2 b/roles/openshift_logging/templates/es.j2 index 81ae070be..16185fc1d 100644 --- a/roles/openshift_logging/templates/es.j2 +++ b/roles/openshift_logging/templates/es.j2 @@ -103,9 +103,4 @@ spec: configMap: name: logging-elasticsearch - name: elasticsearch-storage -{% if pvc_claim is defined and pvc_claim | trim | length > 0 %} - persistentVolumeClaim: - claimName: {{pvc_claim}} -{% else %} - emptyDir: {} -{% endif %} +{% include 'es-storage-'+ es_storage['kind'] + '.partial' %} |