Don't explicitly disable telemetry

Legacy telemetry has been disabled by default since
ussuri.

Change-Id: I08c8897c46aaa722b4b939d2677fe8fa2027c8f6

config/general_config/deprecated/featureset053.yml

@@ -63,9 +63,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/deprecated/minimal_pacemaker.yml

@@ -14,11 +14,11 @@ overcloud_nodes:
 # Tell tripleo how we want things done.
 extra_args: ''
 
-# 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 %}
 

config/general_config/featureset001.yml

@@ -69,9 +69,9 @@ network_isolation_args: >-
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/featureset002.yml

@@ -89,9 +89,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset020.yml

@@ -70,9 +70,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset021.yml

@@ -66,9 +66,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset022.yml

@@ -10,9 +10,11 @@ step_introspect: true
 
 # 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 in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+   {% endif %}
 
 # Network settings
 enable_pacemaker: false

config/general_config/featureset024.yml

@@ -20,9 +20,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset025.yml

@@ -19,9 +19,9 @@ network_isolation_args: >-
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/featureset028.yml

@@ -18,9 +18,9 @@ ssl_overcloud: false
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/featureset030.yml

@@ -29,9 +29,9 @@ ssl_overcloud: false
 
 # 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 %}
 

config/general_config/featureset031.yml

@@ -17,9 +17,9 @@ ssl_overcloud: false
 
 # 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 from ussuri
 telemetry_args: >-
-  {% if release != 'newton' %}
+  {% if release in ['queens', 'stein', 'train'] %}
   -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
   {% endif %}
 

config/general_config/featureset035.yml

@@ -58,9 +58,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset038.yml

@@ -48,9 +48,9 @@ overcloud_roles:
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/featureset039.yml

@@ -59,9 +59,9 @@ network_isolation_args: >-
 
 # 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 %}
 

config/general_config/featureset041.yml

@@ -63,9 +63,9 @@ network_isolation_args: >-
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/featureset042.yml

@@ -23,9 +23,11 @@ network_isolation_args: >-
 
 # 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 in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+   {% endif %}
 
 extra_args: >-
   -e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml

config/general_config/featureset043.yml

@@ -59,9 +59,9 @@ network_isolation_type: "single-nic-vlans"
 
 # 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 %}
 

config/general_config/featureset063.yml

@@ -62,9 +62,9 @@ network_isolation_args: >-
 
 # 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 defaut from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/minimal.yml

@@ -68,9 +68,9 @@ network_isolation_type: "single-nic-vlans"
 
 # 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 from ussuri
 telemetry_args: >-
-   {% if release != 'newton' %}
+   {% if release in ['queens', 'stein', 'train'] %}
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 

config/general_config/pacemaker.yml

@@ -28,9 +28,9 @@ network_isolation_type: "single-nic-vlans"
 
 # 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 %}