Browse Source

Don't use disable-telemetry.yaml

Legacy telemetry has been disabled by default since
ussuri.

Change-Id: I1d233e5109a009bd1422c9657cdadcf4df1d17bd
changes/18/795018/1
ramishra 1 year ago
parent
commit
452bbdca6e
  1. 6
      config/general_config/deprecated/containers_minimal.yml
  2. 8
      config/general_config/ovb-minimal-pacemaker-public-bond.yml
  3. 2
      roles/validate-tempest/templates/configure-tempest.sh.j2

6
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 %}

8
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

2
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 }} \

Loading…
Cancel
Save