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_metrics | |
| 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_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..7928a0346 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 %} |