diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-16 14:25:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 14:25:43 -0400 |
| commit | a4c8b2d019756cbba01d9d2f41add3926c21fb8d (patch) | |
| tree | f12b59aefd522933a97957dc3a7413448f3d96b8 /roles/openshift_metrics | |
| parent | 4c314a6fdce13a0e74736c1548dd0d280d315536 (diff) | |
| parent | 52726611f182c6db390d7a964f0bf24fed297761 (diff) | |
| download | openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.gz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.bz2 openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.xz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.zip | |
Merge pull request #3664 from ewolinetz/logging_cherrypick_3657
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index db4a0e1fc..5921b7bb7 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -47,7 +47,7 @@ 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_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 878bf2c82..a467c1a51 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -22,7 +22,8 @@ with_sequence: count={{ openshift_metrics_cassandra_replicas }} changed_when: false -- set_fact: openshift_metrics_cassandra_pvc_prefix="{{ openshift_metrics_cassandra_pvc_prefix | default('hawkular-metrics') }}" +- set_fact: openshift_metrics_cassandra_pvc_prefix="hawkular-metrics" + when: "not openshift_metrics_cassandra_pvc_prefix or openshift_metrics_cassandra_pvc_prefix == ''" - name: generate hawkular-cassandra persistent volume claims template: @@ -32,8 +33,7 @@ obj_name: "{{ openshift_metrics_cassandra_pvc_prefix }}-{{ item }}" labels: metrics-infra: hawkular-cassandra - access_modes: - - "{{ openshift_metrics_cassandra_pvc_access }}" + access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: @@ -51,8 +51,7 @@ metrics-infra: hawkular-cassandra annotations: volume.alpha.kubernetes.io/storage-class: dynamic - access_modes: - - "{{ openshift_metrics_cassandra_pvc_access }}" + access_modes: "{{ openshift_metrics_cassandra_pvc_access | list }}" size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: openshift_metrics_cassandra_storage_type == 'dynamic' |