diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-03-07 19:45:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-07 19:45:36 -0500 |
commit | 766128bf66cbc45cb2c2539dec0472e7d378a3fb (patch) | |
tree | 9a86bc79677e0dddbaa285e912512e32efbbb945 /roles/openshift_metrics/tasks | |
parent | d3da4d1817d54b9c3aef9fffa6ad166ec950e830 (diff) | |
parent | ab88af6414729556cabf4bde7cbb4ea83b183e3f (diff) | |
download | openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.gz openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.bz2 openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.xz openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.zip |
Merge pull request #3558 from ewolinetz/logging_metrics_defaults
Adding some more logging and metrics defaults
Diffstat (limited to 'roles/openshift_metrics/tasks')
-rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index df39c1e1f..66c81562b 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -31,10 +31,12 @@ labels: metrics-infra: hawkular-cassandra access_modes: - - ReadWriteOnce + - "{{ openshift_metrics_cassandra_pvc_access }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} - when: openshift_metrics_cassandra_storage_type == 'pv' + when: + - openshift_metrics_cassandra_storage_type != 'emptydir' + - openshift_metrics_cassandra_storage_type != 'dynamic' changed_when: false - name: generate hawkular-cassandra persistent volume claims (dynamic) @@ -48,7 +50,7 @@ annotations: volume.alpha.kubernetes.io/storage-class: dynamic access_modes: - - ReadWriteOnce + - "{{ openshift_metrics_cassandra_pvc_access }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: openshift_metrics_cassandra_storage_type == 'dynamic' |