From 21bc2458e585d3fb8b8fdbb0ca167ff1f242b9a8 Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Mon, 23 Jan 2017 13:14:25 -0500 Subject: fixes BZ-1415447. Error when stopping heapster. Modify to be conditional include --- roles/openshift_metrics/tasks/main.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'roles/openshift_metrics') diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index c42440130..1808db5d5 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -7,6 +7,7 @@ - name: Create temp directory for all our templates file: path={{mktemp.stdout}}/templates state=directory mode=0755 changed_when: False + when: "{{ openshift_metrics_install_metrics | bool }}" - name: Copy the admin client config(s) command: > @@ -15,8 +16,4 @@ check_mode: no tags: metrics_init -- include: install_metrics.yaml - when: openshift_metrics_install_metrics | default(false) | bool - -- include: uninstall_metrics.yaml - when: not openshift_metrics_install_metrics | default(false) | bool +- include: "{{ (openshift_metrics_install_metrics | bool) | ternary('install_metrics.yaml','uninstall_metrics.yaml') }}" -- cgit v1.2.3