diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-26 09:19:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 09:19:37 -0400 |
| commit | 90d517d4c179f59e2027965a7eb52c3c0f19cff9 (patch) | |
| tree | 5439ecd4a834abcfc15aac2562445708a3005973 /roles/openshift_logging_elasticsearch | |
| parent | b64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7 (diff) | |
| parent | 3882a25fbe55a922f57cee339fc45e20b84c906b (diff) | |
| download | openshift-90d517d4c179f59e2027965a7eb52c3c0f19cff9.tar.gz openshift-90d517d4c179f59e2027965a7eb52c3c0f19cff9.tar.bz2 openshift-90d517d4c179f59e2027965a7eb52c3c0f19cff9.tar.xz openshift-90d517d4c179f59e2027965a7eb52c3c0f19cff9.zip | |
Merge pull request #4532 from kwoodson/storageclass_dynamic
bugzilla:1463577 - 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..d9ac52cb7 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('', true) }}" 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 %} |