summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-22 09:23:52 -0700
committerGitHub <noreply@github.com>2017-09-22 09:23:52 -0700
commit9240e0d006198f910ea01d34d57f04f9ecd8e7e8 (patch)
treef95f8a2fb02155f7978467088b06a3580e25b0b9 /roles/openshift_metrics/defaults
parentfe2f31cb1ea499d2683e7e30679eef8ac69857ad (diff)
parentb2fdc1cb5e38e39250af702d1e19ed691e4df7d5 (diff)
downloadopenshift-9240e0d006198f910ea01d34d57f04f9ecd8e7e8.tar.gz
openshift-9240e0d006198f910ea01d34d57f04f9ecd8e7e8.tar.bz2
openshift-9240e0d006198f910ea01d34d57f04f9ecd8e7e8.tar.xz
openshift-9240e0d006198f910ea01d34d57f04f9ecd8e7e8.zip
Merge pull request #5176 from ewolinetz/deprecate_log_met_vars
Automatic merge from submit-queue Creating structure to warn for use of deprecated variables and set th… …em in a single location before they are no longer honored Implementation of https://trello.com/c/XKOGHSkP/460-3-deprecate-openshifthostedloggingmetrics-installer-variables Tried to implement this in a way such that we can easily and cleanly add/remove variables in the future for any role we choose. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1449812 https://bugzilla.redhat.com/show_bug.cgi?id=1464349
Diffstat (limited to 'roles/openshift_metrics/defaults')
-rw-r--r--roles/openshift_metrics/defaults/main.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml
index f45100be3..354008206 100644
--- a/roles/openshift_metrics/defaults/main.yaml
+++ b/roles/openshift_metrics/defaults/main.yaml
@@ -15,9 +15,9 @@ openshift_metrics_hawkular_nodeselector: ""
openshift_metrics_hawkular_route_annotations: {}
openshift_metrics_cassandra_replicas: 1
-openshift_metrics_cassandra_storage_type: "{{ openshift_hosted_metrics_storage_kind | default('emptydir') }}"
-openshift_metrics_cassandra_pvc_size: "{{ openshift_hosted_metrics_storage_volume_size | default('10Gi') }}"
-openshift_metrics_cassandra_pv_selector: "{{ openshift_hosted_metrics_storage_labels | default('') }}"
+openshift_metrics_cassandra_storage_type: "{{ openshift_metrics_storage_kind | default('emptydir') }}"
+openshift_metrics_cassandra_pvc_size: "{{ openshift_metrics_storage_volume_size | default('10Gi') }}"
+openshift_metrics_cassandra_pv_selector: "{{ openshift_metrics_storage_labels | default('') }}"
openshift_metrics_cassandra_limits_memory: 2G
openshift_metrics_cassandra_limits_cpu: null
openshift_metrics_cassandra_requests_memory: 1G
@@ -54,8 +54,8 @@ openshift_metrics_master_url: https://kubernetes.default.svc
openshift_metrics_node_id: nodename
openshift_metrics_project: openshift-infra
-openshift_metrics_cassandra_pvc_prefix: "{{ openshift_hosted_metrics_storage_volume_name | default('metrics-cassandra') }}"
-openshift_metrics_cassandra_pvc_access: "{{ openshift_hosted_metrics_storage_access_modes | default(['ReadWriteOnce']) }}"
+openshift_metrics_cassandra_pvc_prefix: "{{ openshift_metrics_storage_volume_name | default('metrics-cassandra') }}"
+openshift_metrics_cassandra_pvc_access: "{{ openshift_metrics_storage_access_modes | default(['ReadWriteOnce']) }}"
openshift_metrics_hawkular_user_write_access: False