diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2017-02-08 17:16:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 17:16:51 -0500 |
| commit | fc96d8d22f6c277b599e6e2fa4e9cc06814a9460 (patch) | |
| tree | e0a3869f2371df29442be883df80d9bdcc9955d7 /roles/openshift_metrics/tasks | |
| parent | 5c6dc36dda1e2ef87f4e43c77e682d829a6bbd3c (diff) | |
| parent | fbd94bbe9cedbc22ebf2329d7ea5310051ddf917 (diff) | |
| download | openshift-fc96d8d22f6c277b599e6e2fa4e9cc06814a9460.tar.gz openshift-fc96d8d22f6c277b599e6e2fa4e9cc06814a9460.tar.bz2 openshift-fc96d8d22f6c277b599e6e2fa4e9cc06814a9460.tar.xz openshift-fc96d8d22f6c277b599e6e2fa4e9cc06814a9460.zip | |
Merge pull request #3294 from jcantrill/fix_metrics_pv_vars
use pvc_size instead of pv_size for openshift_metrics since the role …
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index 9e25071af..df39c1e1f 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -27,12 +27,12 @@ src: pvc.j2 dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml" vars: - obj_name: "{{ openshift_metrics_cassandra_pv_prefix }}-{{ item }}" + obj_name: "{{ openshift_metrics_cassandra_pvc_prefix }}-{{ item }}" labels: metrics-infra: hawkular-cassandra access_modes: - ReadWriteOnce - size: "{{ openshift_metrics_cassandra_pv_size }}" + size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: openshift_metrics_cassandra_storage_type == 'pv' changed_when: false @@ -42,14 +42,14 @@ src: pvc.j2 dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml" vars: - obj_name: "{{ openshift_metrics_cassandra_pv_prefix }}-{{ item }}" + obj_name: "{{ openshift_metrics_cassandra_pvc_prefix }}-{{ item }}" labels: metrics-infra: hawkular-cassandra annotations: volume.alpha.kubernetes.io/storage-class: dynamic access_modes: - ReadWriteOnce - size: "{{ openshift_metrics_cassandra_pv_size }}" + size: "{{ openshift_metrics_cassandra_pvc_size }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} when: openshift_metrics_cassandra_storage_type == 'dynamic' changed_when: false |