diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-13 16:02:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 16:02:18 -0400 |
| commit | 3fed1873230d9e84c07824b7de98ae7edfc481ba (patch) | |
| tree | e97d2dae693b22f30976e5804bdd02cc591cc84b /roles/openshift_metrics/tasks | |
| parent | 75a46c184bda80158c085bcd38b40fd4d02aabd0 (diff) | |
| parent | ee59257a018f081efa1f121cba40f857e07e9ef5 (diff) | |
| download | openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.gz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.bz2 openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.xz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.zip | |
Merge pull request #4302 from ewolinetz/pv_node_selectors
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index 0b6fe7c9e..62b7f52cb 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -23,7 +23,7 @@ changed_when: false - set_fact: openshift_metrics_cassandra_pvc_prefix="hawkular-metrics" - when: not openshift_metrics_cassandra_pvc_prefix or openshift_metrics_cassandra_pvc_prefix == '' + when: "not openshift_metrics_cassandra_pvc_prefix or openshift_metrics_cassandra_pvc_prefix == ''" - name: generate hawkular-cassandra persistent volume claims template: @@ -35,6 +35,7 @@ metrics-infra: hawkular-cassandra access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" + pv_selector: "{{ openshift_metrics_cassandra_pv_selector }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: - openshift_metrics_cassandra_storage_type != 'emptydir' @@ -53,6 +54,7 @@ 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 }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: openshift_metrics_cassandra_storage_type == 'dynamic' changed_when: false |