Configure 3nodes & scenario000-upgrades underclouds

- Enable containerized undercloud for 3nodes jobs, it's ready to work.
- Disable containerized undercloud for upgrade job, we have some THT
  mismatch in quickstart, and we need to fix it. In the meantime, make
  sure we don't deploy it.

Change-Id: I910b15f78dc5a10e304d5aaf249516c56c82f6d0
This commit is contained in:
Emilien Macchi 2018-07-02 20:31:12 -07:00
parent d429f8a9cc
commit e442df45a9
2 changed files with 28 additions and 0 deletions

View File

@ -49,3 +49,26 @@ config_download_args: >-
--disable-validations
--verbose
{%- endif -%}
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 }}/net-config-undercloud.yaml"
undercloud_enable_tempest: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
true
{%- else -%}
false
{%- endif -%}

View File

@ -93,3 +93,8 @@ config_download_args: >-
{% if overcloud_release is defined and overcloud_release in ['queens'] -%}
--no-config-download
{%- endif -%}
undercloud_install_cli_options: >-
{% if release not in ['newton','ocata','pike','queens'] -%}
--use-heat=False
{%- endif -%}