diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-03-06 15:50:46 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-03-06 18:45:38 -0600 |
| commit | c03500de8b10e45bb54a006ddd6cd9ff459423a9 (patch) | |
| tree | 8fc7657ab16018eea3512f20d66bb50b0ce8ec5f | |
| parent | 7c72a665d9391a1597fe192fa88d6d0a50058185 (diff) | |
| download | openshift-c03500de8b10e45bb54a006ddd6cd9ff459423a9.tar.gz openshift-c03500de8b10e45bb54a006ddd6cd9ff459423a9.tar.bz2 openshift-c03500de8b10e45bb54a006ddd6cd9ff459423a9.tar.xz openshift-c03500de8b10e45bb54a006ddd6cd9ff459423a9.zip | |
Updating metrics defaults
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index edaa7d0df..db4a0e1fc 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -16,8 +16,8 @@ openshift_metrics_hawkular_ca: "" openshift_metrics_hawkular_nodeselector: "" openshift_metrics_cassandra_replicas: 1 -openshift_metrics_cassandra_storage_type: emptydir -openshift_metrics_cassandra_pvc_size: 10Gi +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_limits_memory: 2G openshift_metrics_cassandra_limits_cpu: null openshift_metrics_cassandra_requests_memory: 1G @@ -46,7 +46,8 @@ openshift_metrics_master_url: https://kubernetes.default.svc.cluster.local openshift_metrics_node_id: nodename openshift_metrics_project: openshift-infra -openshift_metrics_cassandra_pvc_prefix: metrics-cassandra +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_hawkular_user_write_access: False 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' |