diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-15 13:23:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 13:23:13 -0400 |
| commit | 91ca8e8134bc0af84478125174c58f0fb2b8943c (patch) | |
| tree | ffc967d2d6764fb074fdff67bdd859380acd4bd3 /roles/openshift_metrics | |
| parent | 6362a2cc4e8dfa902f4e04c9b564d3933fbb755e (diff) | |
| parent | 290f703cc0341fcec66bc6ba8f0c05a1e02649b6 (diff) | |
| download | openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.gz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.bz2 openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.xz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.zip | |
Merge pull request #3629 from ewolinetz/logging_15_cherrypick
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/pvc.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/main.yaml | 1 |
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 |