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_metrics | |
| 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_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/pvc.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index 62b7f52cb..ca55f2831 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -36,6 +36,7 @@ access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" pv_selector: "{{ openshift_metrics_cassandra_pv_selector }}" + storage_class_name: "{{ openshift_metrics_cassanda_pvc_storage_class_name | default("", true) }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: - openshift_metrics_cassandra_storage_type != 'emptydir' @@ -50,8 +51,6 @@ obj_name: "{{ openshift_metrics_cassandra_pvc_prefix }}-{{ item }}" labels: metrics-infra: hawkular-cassandra - annotations: - volume.beta.kubernetes.io/storage-class: dynamic access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" pv_selector: "{{ openshift_metrics_cassandra_pv_selector }}" diff --git a/roles/openshift_metrics/templates/pvc.j2 b/roles/openshift_metrics/templates/pvc.j2 index 0b801b33f..b4e6a1503 100644 --- a/roles/openshift_metrics/templates/pvc.j2 +++ b/roles/openshift_metrics/templates/pvc.j2 @@ -32,3 +32,6 @@ spec: resources: requests: storage: {{size}} +{% if storage_class_name is defined %} + storageClassName: {{ storage_class_name }} +{% endif %} |