Run some more featuresets with baremetal provisioning

- fs002
- fs020
- fs035

Also fixes the topology map for fs020(1ctrl_2comp).

Change-Id: I09be09c52606a68c168c923a1e9d57a26cd45812
Closes-Bug: #1895792

config/general_config/featureset002.yml

@@ -52,6 +52,13 @@ undercloud_clean_nodes: >-
   false
   {%- endif -%}
 
+baremetal_provision: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
+
 undercloud_inspection_extras: false
 
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
@@ -80,7 +87,9 @@ extra_args: >-
    {% if release not in ['newton', 'ocata', 'pike'] %}
    -e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
    {% endif %}
-
+   {% if release not in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
+   --disable-validations
+   {%- endif -%}
 # 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

config/general_config/featureset020.yml

@@ -78,7 +78,17 @@ telemetry_args: >-
    -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
    {% endif %}
 
-extra_args: ''
+extra_args: >-
+   {% if release not in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
+   --disable-validations
+   {%- endif -%}
+
+baremetal_provision: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
 
 # keep the doc gen settings at the bottom of the config file.
 # options below direct automatic doc generation by tripleo-collect-logs

config/general_config/featureset035.yml

@@ -74,6 +74,13 @@ extra_args: >-
    --disable-validations
    {%- endif -%}
 
+baremetal_provision: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
+
 undercloud_ntp_servers: pool.ntp.org
 # keep the doc gen settings at the bottom of the config file.
 # options below direct automatic doc generation by tripleo-collect-logs

config/nodes/1ctlr_2comp.yml

@@ -21,5 +21,7 @@ overcloud_nodes:
 node_count: 3
 
 topology_map:
+  Controller:
+    scale: 1
   Compute:
     scale: 2