Updating metrics defaults

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
 

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'