From 452bbdca6e2e0057c58407eeb8399d2bf3a9670c Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Mon, 7 Jun 2021 09:46:33 +0530
Subject: [PATCH] Don't use disable-telemetry.yaml

Legacy telemetry has been disabled by default since
ussuri.

Change-Id: I1d233e5109a009bd1422c9657cdadcf4df1d17bd
---
 config/general_config/deprecated/containers_minimal.yml   | 6 +++---
 .../general_config/ovb-minimal-pacemaker-public-bond.yml  | 8 ++++----
 roles/validate-tempest/templates/configure-tempest.sh.j2  | 2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/general_config/deprecated/containers_minimal.yml b/config/general_config/deprecated/containers_minimal.yml
index 84143db60..ab1a36596 100644
--- a/config/general_config/deprecated/containers_minimal.yml
+++ b/config/general_config/deprecated/containers_minimal.yml
@@ -8,11 +8,11 @@ step_introspect: true
 extra_args: >-
   --ntp-server pool.ntp.org
 
-# This config is extremely resource intensive, so we disable telemetry
+# This featureset is extremely resource intensive, so we disable telemetry
 # in order to reduce the overall memory footprint
-# This is not required in newton
+# Disabled by default in ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 
diff --git a/config/general_config/ovb-minimal-pacemaker-public-bond.yml b/config/general_config/ovb-minimal-pacemaker-public-bond.yml
index 100035047..57e3b9761 100644
--- a/config/general_config/ovb-minimal-pacemaker-public-bond.yml
+++ b/config/general_config/ovb-minimal-pacemaker-public-bond.yml
@@ -21,11 +21,11 @@ extra_args: " --control-flavor baremetal --compute-flavor baremetal "
 
 # This featureset is extremely resource intensive, so we disable telemetry
 # in order to reduce the overall memory footprint
-# This is not required in newton
+# Disabled by default in ussuri
 telemetry_args: >-
-  {% if release not in ['newton', 'ocata'] %}
-  -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
-  {% endif %}
+   {% if release in ['queens', 'stein', 'train'] %}
+   -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+   {% endif %}
 
 run_tempest: false
 tempest_config: false
diff --git a/roles/validate-tempest/templates/configure-tempest.sh.j2 b/roles/validate-tempest/templates/configure-tempest.sh.j2
index 0e2fe10b5..561fd072c 100644
--- a/roles/validate-tempest/templates/configure-tempest.sh.j2
+++ b/roles/validate-tempest/templates/configure-tempest.sh.j2
@@ -194,9 +194,7 @@ $TEMPESTCONF --out etc/tempest.conf \
   compute.build_timeout 500 \
   network.build_timeout 500 \
   volume.build_timeout 500 \
-  {% if 'disable-telemetry.yaml' in telemetry_args|default('') %}
   service_available.aodh_plugin False \
-  {% endif %}
   {% if tempest_extra_config %}
   {% for key, value in tempest_extra_config.items() %}
   {{ key }} {{ value }} \