openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Switch to containerized undercloud net config"

This commit is contained in:
Zuul 2018-06-30 09:13:34 +00:00 committed by Gerrit Code Review
parent f4ff204cee fb01990712
commit 42beeacbf3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset020.yml
View File

@ -91,7 +91,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": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
"OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml"
undercloud_enable_tempest: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
true

2
config/general_config/featureset027.yml
View File

@ -19,7 +19,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": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
"OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml"
# Enable tempest container
undercloud_enable_tempest: true

2
config/general_config/featureset037.yml
View File

@ -80,7 +80,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": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
"OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml"
ctlplane_masquerade: >-
{% if release not in ['newton','ocata','pike','queens'] -%}
true