summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-30 09:36:32 -0800
committerGitHub <noreply@github.com>2018-01-30 09:36:32 -0800
commit2afe2596c6dd9641bdbb3c6294d5df53f5c140f5 (patch)
treea2c72f607657e09bbfc85f5a2dd6eff80041e5a8
parentb1828482c9ed63a387dbbfa59930192424a15fa4 (diff)
parent63e8ca2de1784a62c171d412936aabcc308a30ce (diff)
downloadopenshift-2afe2596c6dd9641bdbb3c6294d5df53f5c140f5.tar.gz
openshift-2afe2596c6dd9641bdbb3c6294d5df53f5c140f5.tar.bz2
openshift-2afe2596c6dd9641bdbb3c6294d5df53f5c140f5.tar.xz
openshift-2afe2596c6dd9641bdbb3c6294d5df53f5c140f5.zip
Merge pull request #6928 from ewolinetz/metrics_fix_pvc
Automatic merge from submit-queue. Removing ability to change default cassandra_pvc_prefix based on metr… …ics volume name Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1539382 There isn't a reason to change the pvc name to match the volume name.
-rw-r--r--roles/openshift_metrics/defaults/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml
index 8da74430f..293d8f451 100644
--- a/roles/openshift_metrics/defaults/main.yaml
+++ b/roles/openshift_metrics/defaults/main.yaml
@@ -54,7 +54,7 @@ openshift_metrics_master_url: https://kubernetes.default.svc
openshift_metrics_node_id: nodename
openshift_metrics_project: openshift-infra
-openshift_metrics_cassandra_pvc_prefix: "{{ openshift_metrics_storage_volume_name | default('metrics-cassandra') }}"
+openshift_metrics_cassandra_pvc_prefix: metrics-cassandra
openshift_metrics_cassandra_pvc_access: "{{ openshift_metrics_storage_access_modes | default(['ReadWriteOnce']) }}"
openshift_metrics_hawkular_user_write_access: False