diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-06-21 15:08:09 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-06-21 15:23:52 -0400 |
| commit | cef95005f2d635cac96394206a0fa08e0da45c3d (patch) | |
| tree | 18700d34dc44a5a57c02a7698d7297526a163593 /roles/openshift_logging_elasticsearch | |
| parent | de93b27df139b19f1949065ae4118903971551d8 (diff) | |
| download | openshift-cef95005f2d635cac96394206a0fa08e0da45c3d.tar.gz openshift-cef95005f2d635cac96394206a0fa08e0da45c3d.tar.bz2 openshift-cef95005f2d635cac96394206a0fa08e0da45c3d.tar.xz openshift-cef95005f2d635cac96394206a0fa08e0da45c3d.zip | |
Fix for dynamic pvs when using storageclasses.
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/pvc.j2 | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 684dbe0a0..9d1c59192 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -194,7 +194,9 @@ - port: 9200 targetPort: "restapi" -- name: Creating ES storage template +# storageclasses are used by default but if static then disable +# storageclasses with the storageClassName set to "" in pvc.j2 +- name: Creating ES storage template - static template: src: pvc.j2 dest: "{{ tempdir }}/templates/logging-es-pvc.yml" @@ -203,11 +205,13 @@ size: "{{ 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("") }}" when: - openshift_logging_elasticsearch_storage_type == "pvc" - not openshift_logging_elasticsearch_pvc_dynamic -- name: Creating ES storage template +# Storageclasses are used by default if configured +- name: Creating ES storage template - dynamic template: src: pvc.j2 dest: "{{ tempdir }}/templates/logging-es-pvc.yml" @@ -216,8 +220,6 @@ size: "{{ openshift_logging_elasticsearch_pvc_size }}" access_modes: "{{ openshift_logging_elasticsearch_pvc_access_modes | list }}" pv_selector: "{{ openshift_logging_elasticsearch_pvc_pv_selector }}" - annotations: - volume.beta.kubernetes.io/storage-class: "dynamic" when: - openshift_logging_elasticsearch_storage_type == "pvc" - openshift_logging_elasticsearch_pvc_dynamic diff --git a/roles/openshift_logging_elasticsearch/templates/pvc.j2 b/roles/openshift_logging_elasticsearch/templates/pvc.j2 index f19a3a750..063f9c5ae 100644 --- a/roles/openshift_logging_elasticsearch/templates/pvc.j2 +++ b/roles/openshift_logging_elasticsearch/templates/pvc.j2 @@ -25,3 +25,6 @@ spec: resources: requests: storage: {{size}} +{% if storage_class_name is defined %} + storageClassName: {{ storage_class_name }} +{% endif %} |