summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-03-10 16:08:35 -0600
committerewolinetz <ewolinet@redhat.com>2017-03-10 16:25:22 -0600
commit290f703cc0341fcec66bc6ba8f0c05a1e02649b6 (patch)
treed5b280cbd2988a0b4bc2e3519419824b43280558 /roles/openshift_metrics
parent39d078c8b1a17f3e4b827f9962a9f317a6464f3e (diff)
downloadopenshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.gz
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.bz2
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.xz
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.zip
cherry picking from #3621 #3614 #3627
Diffstat (limited to 'roles/openshift_metrics')
-rw-r--r--roles/openshift_metrics/tasks/install_cassandra.yaml2
-rw-r--r--roles/openshift_metrics/templates/pvc.j22
-rw-r--r--roles/openshift_metrics/vars/main.yaml1
3 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml
index 66c81562b..878bf2c82 100644
--- a/roles/openshift_metrics/tasks/install_cassandra.yaml
+++ b/roles/openshift_metrics/tasks/install_cassandra.yaml
@@ -22,6 +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') }}"
+
- name: generate hawkular-cassandra persistent volume claims
template:
src: pvc.j2
diff --git a/roles/openshift_metrics/templates/pvc.j2 b/roles/openshift_metrics/templates/pvc.j2
index 8fbfa8b5d..885dd368d 100644
--- a/roles/openshift_metrics/templates/pvc.j2
+++ b/roles/openshift_metrics/templates/pvc.j2
@@ -1,7 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
- name: {{obj_name}}
+ name: "{{obj_name}}"
{% if labels is not defined %}
labels:
logging-infra: support
diff --git a/roles/openshift_metrics/vars/main.yaml b/roles/openshift_metrics/vars/main.yaml
index 4a3724e3f..47aa76dd2 100644
--- a/roles/openshift_metrics/vars/main.yaml
+++ b/roles/openshift_metrics/vars/main.yaml
@@ -8,3 +8,4 @@ openshift_metrics_cassandra_storage_types:
- emptydir
- pv
- dynamic
+- nfs