Convert fs020 and fs035 to use ephemeral heat
This featuresets still deploy installed heat, Converting it to use ephermal heat. Related-bug: #1944217 Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/810082 Change-Id: I3b948d7ba137dc4bd12bf2aac0d8b4ab3c1e30cc
This commit is contained in:
parent
876238e81d
commit
675d0103a0
|
@ -65,7 +65,13 @@ enable_pacemaker: true
|
|||
network_isolation: true
|
||||
network_isolation_type: "multiple-nics"
|
||||
network_isolation_args: >-
|
||||
{% if not release in ['train','ussuri','victoria'] -%}
|
||||
--networks-file {{ overcloud_templates_path }}/ci/network_data.yaml
|
||||
-e {{ working_dir }}/overcloud-networks-deployed.yaml
|
||||
-e {{ working_dir }}/overcloud-vips-deployed.yaml
|
||||
{% else %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
|
||||
|
||||
# This featureset is extremely resource intensive, so we disable telemetry
|
||||
|
@ -76,6 +82,9 @@ telemetry_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
|
||||
{% endif %}
|
||||
|
||||
ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
|
||||
ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
|
||||
|
||||
# neutron_l3_qos.yaml sets correct L3 agent's extensions to run QoS related
|
||||
# tests. It is related only to the ML2/OVS case and featureset020 runs Neutron
|
||||
# with ML2/OVS only in queens. The template doesn't apply to newer branches
|
||||
|
@ -106,6 +115,14 @@ baremetal_provision: >-
|
|||
true
|
||||
{%- endif -%}
|
||||
|
||||
# Provision composable networks prior to creating the heat stack
|
||||
network_provision: >-
|
||||
{% if release in ['train','ussuri','victoria'] -%}
|
||||
false
|
||||
{%- else -%}
|
||||
true
|
||||
{%- endif -%}
|
||||
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
artcl_gen_docs: true
|
||||
|
|
|
@ -46,13 +46,25 @@ undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.ya
|
|||
undercloud_cloud_domain: "localdomain"
|
||||
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
|
||||
|
||||
ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"
|
||||
ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
|
||||
|
||||
# Tell tripleo about our environment.
|
||||
overcloud_ipv6: true
|
||||
enable_pacemaker: true
|
||||
network_isolation: true
|
||||
network_isolation_type: "multiple-nics"
|
||||
network_data_yaml: "{{ overcloud_templates_path }}/ci/network_data_v6.yaml"
|
||||
vip_data_yaml: "{{ overcloud_templates_path }}/ci/vip_data_v6.yaml"
|
||||
network_isolation_args: >-
|
||||
{% if not release in ['train','ussuri','victoria'] -%}
|
||||
--networks-file {{ overcloud_templates_path }}/ci/network_data_v6.yaml
|
||||
--vip-file {{ overcloud_templates_path }}/ci/vip_data_v6.yaml
|
||||
-e {{ working_dir }}/overcloud-networks-deployed.yaml
|
||||
-e {{ working_dir }}/overcloud-vips-deployed.yaml
|
||||
{%else%}
|
||||
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
|
||||
-e {{ working_dir }}/network-environment.yaml
|
||||
|
||||
|
@ -83,6 +95,14 @@ baremetal_provision: >-
|
|||
true
|
||||
{%- endif -%}
|
||||
|
||||
# Provision composable networks prior to creating the heat stack
|
||||
network_provision: >-
|
||||
{% if release in ['train','ussuri','victoria'] -%}
|
||||
false
|
||||
{%- else -%}
|
||||
true
|
||||
{%- endif -%}
|
||||
|
||||
undercloud_ntp_servers: pool.ntp.org
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
|
|
Loading…
Reference in New Issue