openstack
/
tripleo-quickstart
Code Issues Proposed changes

Use net-config-simple-bridge.yaml from THT 

... instead of the one in tripleo-ci.
We're moving out the CI env files from tripleo-ci so we can branch them.

Depends-On: I4255120e12123568a388c75956e6e8d32dec66aa

Change-Id: I5fccc9fa1d96ff7ecb47923751e0db18ae5c02aa
This commit is contained in:
Emilien Macchi 2018-02-21 10:28:27 -08:00
parent 635536f641
commit 1f135b50d3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset027.yml
View File

@ -18,7 +18,7 @@ undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.ya
undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
undercloud_resource_registry_args:
"OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ tripleo_root }}/tripleo-ci/undercloud-configs/net-config-multinode.yaml"
"OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
# turn off image prep
step_overcloud_image: false