Revert "Revert "Deploy container-multinode (fs010) with a containerized undercloud""

This reverts commit a76f5e5c3e.
Change-Id: Ib25edc4b235181b172d8e9c89efc7a624636fe41

config/general_config/featureset010.yml

@@ -6,6 +6,23 @@ enable_pacemaker: false
 overcloud_ipv6: false
 containerized_overcloud: 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"
+
 # This enables TLS for the undercloud which will also make haproxy bind to the
 # configured public-vip and admin-vip.
 undercloud_generate_service_certificate: false
@@ -34,6 +51,12 @@ tempest_format: >-
   {%- else -%}
   packages
   {%- endif -%}
+undercloud_enable_tempest: >-
+  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
 
 composable_roles: true
 overcloud_roles: