openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use ansible for default simple ovs bridge config"

This commit is contained in:
Zuul 2020-10-11 10:54:58 +00:00 committed by Gerrit Code Review
parent b6eb9fbe93 ebef16836e
commit d1ea32cc88
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/neutron-ovs-dvr.yaml
View File

@ -19,7 +19,8 @@ resource_registry:
# With using default template values, the Compute nodes also need the br-ex
# bridge to be connected to a physical network.
OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
ComputeNetworkConfigWithAnsible: true
ComputeNetworkConfigTemplate: 'templates/net_config_bridge.j2'
# Disable OVN services
OS::TripleO::Services::OVNController: OS::Heat::None

3
environments/services/neutron-ovs-dvr.yaml
View File

@ -14,7 +14,8 @@ resource_registry:
OS::TripleO::Services::NeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml
OS::TripleO::Services::ComputeNeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml
OS::TripleO::Services::ComputeNeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml
OS::TripleO::ComputeDVR::Net::SoftwareConfig: ../../net-config-bridge.yaml
ComputeDVRNetworkConfigWithAnsible: true
ComputeDVRNetworkConfigTemplate: 'templates/net_config_bridge.j2'
# Disable OVN services
OS::TripleO::Services::OVNController: OS::Heat::None

7
overcloud-resource-registry-puppet.j2.yaml
View File

@ -14,16 +14,11 @@ resource_registry:
OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
# Port assignments for the {{role.name}} role
{%- for network in networks if network.enabled|default(true) and network.name in role.networks|default([]) %}
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: network/ports/noop.yaml
{%- endfor %}
{%- if 'external_bridge' in role.tags %}
# Create Neutron external bridge for floating IPs and/or SNAT
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-bridge.yaml
{%- else %}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{%- endif %}
{% endfor %}
{% for role in roles %}