openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Switch fs001 to Deploy Undercloud with OVN"

This commit is contained in:
Zuul 2022-09-19 17:10:35 +00:00 committed by Gerrit Code Review
parent 6976054bf2 31a454fba9
commit 08588f00a5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/general_config/featureset001.yml
View File

@ -17,7 +17,14 @@ undercloud_clean_nodes: true
undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
# Deploy ml2/ovn on Undercloud with zed+ release
undercloud_custom_env_files: >-
{% if release not in ['train', 'wallaby'] -%}
{{ working_dir }}/undercloud-parameter-defaults.yaml {{ undercloud_templates_path }}/environments/services/undercloud-neutron-ovn-dhcp.yaml
{%- else -%}
{{ working_dir }}/undercloud-parameter-defaults.yaml
{%- endif %}
undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"