From 3b17cd0e7c5e29cd1c577dd1fd0f7a19c72a3958 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 14 Jun 2018 05:39:44 +0000
Subject: [PATCH] Reconfigure undercloud args for scenarios

scenario003,004,007: enable the containerized undercloud.
This partially reverts commit 184558bc3b71428c4c651f54c9e95a3c7fa9df6b.

Change-Id: Iae4c6e23477661ea32847885ab2135bb1646350d
---
 config/general_config/featureset018.yml | 23 +++++++++++++++++++++++
 config/general_config/featureset019.yml | 23 +++++++++++++++++++++++
 config/general_config/featureset030.yml | 23 +++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index d6ddf7443..9a6194752 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -19,6 +19,29 @@ 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:
diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml
index 4fb204ece..7ee742805 100644
--- a/config/general_config/featureset019.yml
+++ b/config/general_config/featureset019.yml
@@ -19,6 +19,29 @@ 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:
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 9b420150f..5a2a5ad69 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -9,6 +9,29 @@ 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