summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-26 13:12:35 -0400
committerScott Dodson <sdodson@redhat.com>2016-08-26 13:12:35 -0400
commit8a5bead6a967be993b0027b558d69952cd8256f8 (patch)
treea1d5c16e7f9aaf17f4eccf02ae572a1bf0d428a4
parentcc225aaf86ce48701d246566c6fefa4d1d29781a (diff)
downloadopenshift-8a5bead6a967be993b0027b558d69952cd8256f8.tar.gz
openshift-8a5bead6a967be993b0027b558d69952cd8256f8.tar.bz2
openshift-8a5bead6a967be993b0027b558d69952cd8256f8.tar.xz
openshift-8a5bead6a967be993b0027b558d69952cd8256f8.zip
Fix metrics for containerized installs
-rw-r--r--roles/openshift_metrics/tasks/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml
index 85dd6ba0f..ad04bc355 100644
--- a/roles/openshift_metrics/tasks/main.yaml
+++ b/roles/openshift_metrics/tasks/main.yaml
@@ -35,7 +35,7 @@
| oo_hostname_from_url }}"
metrics_persistence: "{{ openshift.hosted.metrics.storage_kind | default(none) is not none }}"
metrics_dynamic_vol: "{{ openshift.hosted.metrics.storage_kind | default(none) == 'dynamic' }}"
- metrics_template_dir: "/usr/share/openshift/examples/infrastructure-templates/{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}"
+ metrics_template_dir: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/examples/infrastructure-templates/{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}"
cassandra_nodes: "{{ ',CASSANDRA_NODES=' ~ openshift.hosted.metrics.cassandra_nodes if 'cassandra' in openshift.hosted.metrics else '' }}"
cassandra_pv_size: "{{ ',CASSANDRA_PV_SIZE=' ~ openshift.hosted.metrics.storage_volume_size if openshift.hosted.metrics.storage_volume_size | default(none) is not none else '' }}"
image_prefix: "{{ ',IMAGE_PREFIX=' ~ openshift.hosted.metrics.deployer_prefix if 'deployer_prefix' in openshift.hosted.metrics else '' }}"