From e99b0d8cc868f245cd499f6383eca0b70ac693c7 Mon Sep 17 00:00:00 2001
From: Eric Wolinetz <ewolinet@redhat.com>
Date: Fri, 29 Sep 2017 11:40:16 -0500
Subject: Reverting using uninstall variables for logging and metrics

---
 roles/openshift_metrics/defaults/main.yaml | 1 -
 roles/openshift_metrics/tasks/main.yaml    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'roles/openshift_metrics')

diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml
index 084b734ee..8da74430f 100644
--- a/roles/openshift_metrics/defaults/main.yaml
+++ b/roles/openshift_metrics/defaults/main.yaml
@@ -1,7 +1,6 @@
 ---
 openshift_metrics_start_cluster: True
 openshift_metrics_install_metrics: False
-openshift_metrics_uninstall_metrics: False
 openshift_metrics_startup_timeout: 500
 
 openshift_metrics_hawkular_replicas: 1
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml
index c92458c50..10509fc1e 100644
--- a/roles/openshift_metrics/tasks/main.yaml
+++ b/roles/openshift_metrics/tasks/main.yaml
@@ -49,7 +49,7 @@
 
 - include: uninstall_metrics.yaml
   when:
-    - openshift_metrics_uninstall_metrics | bool
+    - not openshift_metrics_install_metrics | bool
 
 - include: uninstall_hosa.yaml
   when: not openshift_metrics_install_hawkular_agent | bool
-- 
cgit v1.2.3