Revert "Switch scenario00{1,2,3,4,7} to containerized undercloud"

This reverts commit b2eb98f203.

Change-Id: I65378c502c02c107c5d4f89450b56583ff4e7c25

config/general_config/featureset016.yml

@@ -21,29 +21,6 @@ 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

@@ -19,29 +19,6 @@ 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:

config/general_config/featureset018.yml

@@ -19,29 +19,6 @@ composable_scenario: scenario003-multinode-containers.yaml
 validate_template: scenario003-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/featureset019.yml

@@ -19,29 +19,6 @@ composable_scenario: scenario004-multinode-containers.yaml
 validate_template: scenario004-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/featureset030.yml

@@ -9,29 +9,6 @@ enable_pacemaker: true
 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"
-undercloud_enable_tempest: >-
-  {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-
 # 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