diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-12 14:49:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 14:49:51 -0400 |
| commit | 897e62c2739fef22d967f184fc0fc694150f4e09 (patch) | |
| tree | f9075d11bec4bec3f768aad3ae60259b8c2c866f /roles | |
| parent | 8c0bcb43d96c4e8a2f34931b0aa689fcea113c66 (diff) | |
| parent | 521ebaf9eecc38029cfe6fe0e10a13888cb3f83e (diff) | |
| download | openshift-897e62c2739fef22d967f184fc0fc694150f4e09.tar.gz openshift-897e62c2739fef22d967f184fc0fc694150f4e09.tar.bz2 openshift-897e62c2739fef22d967f184fc0fc694150f4e09.tar.xz openshift-897e62c2739fef22d967f184fc0fc694150f4e09.zip | |
Merge pull request #4223 from hemmop/bug/storage-class-annotation
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 7e88a7498..f1d15b76d 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -217,7 +217,7 @@ access_modes: "{{ openshift_logging_elasticsearch_pvc_access_modes | list }}" pv_selector: "{{ openshift_logging_elasticsearch_pvc_pv_selector }}" annotations: - volume.alpha.kubernetes.io/storage-class: "dynamic" + volume.beta.kubernetes.io/storage-class: "dynamic" when: - openshift_logging_elasticsearch_storage_type == "pvc" - openshift_logging_elasticsearch_pvc_dynamic diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index 3b4e8560f..0b6fe7c9e 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -50,7 +50,7 @@ labels: metrics-infra: hawkular-cassandra annotations: - volume.alpha.kubernetes.io/storage-class: dynamic + volume.beta.kubernetes.io/storage-class: dynamic access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} |