Merge "fs001: Enable support for routed ctlplane networks"

This commit is contained in:
Zuul 2018-04-20 11:11:45 +00:00 committed by Gerrit Code Review
commit 5653342ff9
2 changed files with 14 additions and 0 deletions

View File

@ -36,6 +36,13 @@ ctlplane_masquerade: >-
false
{%- endif -%}
undercloud_enable_routed_networks: >-
{% if release not in ['newton','ocata','pike'] -%}
true
{%- else -%}
false
{%- endif -%}
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"

View File

@ -25,6 +25,13 @@ extra_args: >-
--ntp-server pool.ntp.org
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
undercloud_enable_routed_networks: >-
{% if release not in ['newton','ocata','pike'] -%}
true
{%- else -%}
false
{%- 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