Merge "Simplify handling of 'telemetry' scenario in CI tests"

tests/roles/bootstrap-host/vars/main.yml

@@ -60,7 +60,7 @@ bootstrap_host_scenarios_expanded: |-
   {% if 'murano' in bootstrap_host_scenarios %}
   {%   set _ = scenario_list.extend(['heat'])  %}
   {% endif %}
-  {% if 'telemetry' in bootstrap_host_scenarios %}
+  {% if ['telemetry', 'aodh', 'ceilometer', 'gnocchi'] | intersect(bootstrap_host_scenarios) | length > 0 %}
   {%   set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi']) %}
   {% endif %}
   {% if 'translations' in bootstrap_host_scenarios %}

zuul.d/playbooks/pre-gate-scenario.yml

@@ -16,10 +16,6 @@
 - name: Calculate the dynamic OSA gate scenario
   hosts: all[0]
   vars:
-    scenario_map:
-      aodh: telemetry
-      ceilometer: telemetry
-      gnocchi: telemetry
     install_methods:
       - distro
       - source
@@ -55,10 +51,6 @@
           {%   endif %}
           {%   if role_service_name is defined %}
           {%     set _ = _scenario.append(role_service_name) %}
-          {#     Add special scenarios based on the project name #}
-          {%     if role_service_name in scenario_map %}
-          {%       set _ = _scenario.append(scenario_map[role_service_name]) %}
-          {%     endif %}
           {%   endif %}
           {% endif %}
           {% if zuul.job is match('^openstack-ansible-(deploy|upgrade)-([^-]+)-validate') %}