Update the config for FS021

* Includes containerized undercloud in the FS

Change-Id: I8541eeb66c8755619edd097d385ab226ebc25428
Closes-Bug: #1781541

config/general_config/featureset021.yml

@@ -22,6 +22,33 @@ containerized_overcloud: >-
   {%- endif -%}
 delete_docker_cache: true
 
+containerized_undercloud: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
+# Run containerized tempest from master and ongoing
+tempest_format: >-
+  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
+  container
+  {%- else -%}
+  packages
+  {%- endif -%}
+undercloud_enable_tempest: >-
+  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- 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"
+
 # Tell tripleo about our environment
 enable_pacemaker: false
 network_isolation: false