Enabling cont/uc on scenario001/002

Change-Id: I9b237fa402539f125522d1e40f1281fbb12c26cf

config/general_config/featureset016.yml

@@ -12,10 +12,6 @@ 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
 
@@ -25,6 +21,29 @@ composable_scenario: scenario001-multinode-containers.yaml
 validate_template: scenario001-multinode.yaml
 deployed_server: true
 
+containerized_undercloud: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+undercloud_install_cli_options: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  --use-heat
+  {%- endif -%}
+
+undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
+undercloud_cloud_domain: "localdomain"
+undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
+undercloud_resource_registry_args:
+  "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
+undercloud_enable_tempest: >-
+  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
 artcl_create_docs_payload:

config/general_config/featureset017.yml

@@ -10,11 +10,6 @@ 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
 
@@ -22,6 +17,29 @@ composable_scenario: scenario002-multinode-containers.yaml
 validate_template: scenario002-multinode.yaml
 deployed_server: true
 
+containerized_undercloud: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+undercloud_install_cli_options: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  --use-heat
+  {%- endif -%}
+
+undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
+undercloud_cloud_domain: "localdomain"
+undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
+undercloud_resource_registry_args:
+  "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
+undercloud_enable_tempest: >-
+  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
 artcl_create_docs_payload: