diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-03-15 13:29:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-15 13:29:55 -0500 |
commit | 52726611f182c6db390d7a964f0bf24fed297761 (patch) | |
tree | bd8ce1f37b22ab4cfb6bdde5a62deb90245b09c3 /roles/openshift_metrics | |
parent | 6962f09c1dbb4e963b32667d7106a3c547a35a0f (diff) | |
parent | 91ca8e8134bc0af84478125174c58f0fb2b8943c (diff) | |
download | openshift-52726611f182c6db390d7a964f0bf24fed297761.tar.gz openshift-52726611f182c6db390d7a964f0bf24fed297761.tar.bz2 openshift-52726611f182c6db390d7a964f0bf24fed297761.tar.xz openshift-52726611f182c6db390d7a964f0bf24fed297761.zip |
Merge branch 'master' into logging_cherrypick_3657
Diffstat (limited to 'roles/openshift_metrics')
-rw-r--r-- | roles/openshift_metrics/templates/pvc.j2 | 2 | ||||
-rw-r--r-- | roles/openshift_metrics/vars/main.yaml | 1 |
2 files changed, 2 insertions, 1 deletions
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 |