diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-08-23 09:56:34 -0500 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-20 16:43:27 -0500 |
| commit | b2fdc1cb5e38e39250af702d1e19ed691e4df7d5 (patch) | |
| tree | b5e8368514f9ae29f6fefef1d5e7ae7d8c1ee95c /roles/openshift_metrics/defaults | |
| parent | 457e0f80784820b9ff0fb6a7407c271731f5b1d9 (diff) | |
| download | openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.gz openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.bz2 openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.xz openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.zip | |
Creating structure to warn for use of deprecated variables and set them in a single location before they are no longer honored
Diffstat (limited to 'roles/openshift_metrics/defaults')
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index d9a17ae7f..3ebc90ce2 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -14,9 +14,9 @@ openshift_metrics_hawkular_ca: "" openshift_metrics_hawkular_nodeselector: "" 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 @@ -53,8 +53,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 |