Add settings from fs001 missing in fs035

fs035 should match fs001 - except for the ipv6-related
settings. This patch adds some settings recently added
to fs001 - not yet added to fs035.

Change-Id: Idd6a347a50c0ef50cd62e792acfef9401eb5d25a
Related-Bug: #1840616

config/general_config/featureset035.yml

@@ -41,9 +41,19 @@ network_isolation_args: >-
   -e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
   -e {{ working_dir }}/network-environment.yaml
 
+# This featureset is extremely resource intensive, so we disable telemetry
+# in order to reduce the overall memory footprint
+# This is not required in newton
+telemetry_args: >-
+   {% if release != 'newton' %}
+   -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+   {% endif %}
+
 extra_args: >-
   -e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
 
+undercloud_ntp_servers: pool.ntp.org
+
 undercloud_enable_routed_networks: >-
   {% if release not in ['newton','ocata','pike'] -%}
   true
@@ -51,6 +61,15 @@ undercloud_enable_routed_networks: >-
   false
   {%- endif -%}
 
+undercloud_clean_nodes: >-
+  {% if release not in ['newton','ocata','pike'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
+undercloud_inspection_extras: false
+
 # keep the doc gen settings at the bottom of the config file.
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
@@ -87,6 +106,12 @@ deploy_steps_ansible_workflow: >-
   {%- else -%}
   false
   {%- endif -%}
+config_download_args: >-
+  {% if release in ['queens'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  --config-download
+  --verbose
+  {%- endif -%}
 
 # Tempest configuration, keep always at the end of the file
 test_ping: false