summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-26 13:12:09 -0400
committerScott Dodson <sdodson@redhat.com>2016-08-26 13:12:09 -0400
commitcc225aaf86ce48701d246566c6fefa4d1d29781a (patch)
tree267acfa97fd073af950d996a9f3516d8ddfc74ed
parent739648d2131a2723a21eafa4217203025438e729 (diff)
downloadopenshift-cc225aaf86ce48701d246566c6fefa4d1d29781a.tar.gz
openshift-cc225aaf86ce48701d246566c6fefa4d1d29781a.tar.bz2
openshift-cc225aaf86ce48701d246566c6fefa4d1d29781a.tar.xz
openshift-cc225aaf86ce48701d246566c6fefa4d1d29781a.zip
Cleanup items botched during rebase
-rw-r--r--roles/openshift_metrics/tasks/install.yml2
-rw-r--r--roles/openshift_metrics/tasks/main.yaml3
2 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_metrics/tasks/install.yml b/roles/openshift_metrics/tasks/install.yml
index 2fbb7d606..ea4f61ccd 100644
--- a/roles/openshift_metrics/tasks/install.yml
+++ b/roles/openshift_metrics/tasks/install.yml
@@ -74,7 +74,7 @@
HAWKULAR_METRICS_HOSTNAME={{ metrics_hostname }},USE_PERSISTENT_STORAGE={{metrics_persistence | string | lower }},METRIC_DURATION={{ openshift.hosted.metrics.duration }},METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }}{{ image_prefix }}{{ image_version }},MODE={{ deployment_mode }} \
| {{ openshift.common.client_binary }} --namespace openshift-infra \
--config={{ openshift_metrics_kubeconfig }} \
- create -f -"
+ create -o name -f -"
- name: Deploy Metrics
shell: "{{ deployer_cmd }}"
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml
index 8a6712468..85dd6ba0f 100644
--- a/roles/openshift_metrics/tasks/main.yaml
+++ b/roles/openshift_metrics/tasks/main.yaml
@@ -33,8 +33,7 @@
| default('hawkular-metrics.' ~ (openshift.master.default_subdomain
| default(openshift_master_default_subdomain )))
| oo_hostname_from_url }}"
- metrics_persistence: True
- #"{{ openshift.hosted.metrics.storage_kind | default(none) is not none }}"
+ 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' }}"
cassandra_nodes: "{{ ',CASSANDRA_NODES=' ~ openshift.hosted.metrics.cassandra_nodes if 'cassandra' in openshift.hosted.metrics else '' }}"