Enforce use-heat=False on 3 jobs

* fs003: This job aims to test a non-containerized undercloud so let's make sure
  heat isn't enabled.

* fs016/017: scenario 001 and 002 are timeouting. Until we figure this
  out, let's make them deploying a non containerized undercloud.

Depends-On: Ibc6fb33d752346d6f8b3a61d74e0bc73c1ac20e3
Depends-On: I9ca5264b77660c34a91b051916cf17fcadf49b37
Change-Id: I7c9c016295fa28078706595dcf7c307e79b2a122

config/general_config/featureset003.yml

@@ -3,6 +3,11 @@ ssl_overcloud: false
 undercloud_check_idempotency: true
 undercloud_check_sanity: false
 
+undercloud_install_cli_options: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  --use-heat=False
+  {%- endif -%}
+
 test_ping: false
 run_tempest: true
 test_regex: ''

config/general_config/featureset016.yml

@@ -12,6 +12,10 @@ enable_opstools_repo: true
 
 containerized_overcloud: true
 undercloud_generate_service_certificate: false
+undercloud_install_cli_options: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  --use-heat=False
+  {%- endif -%}
 
 ssl_overcloud: false
 

config/general_config/featureset017.yml

@@ -10,7 +10,10 @@ overcloud_ipv6: false
 
 containerized_overcloud: true
 undercloud_generate_service_certificate: false
-
+undercloud_install_cli_options: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  --use-heat=False
+  {%- endif -%}
 ssl_overcloud: false
 
 step_introspect: false