openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move *NetworkConfigTemplate to parameter_defaults 

Regression from I28892e638f30321b271ceaf54b60020a43ceebb6.

Change-Id: I767052050f63a9d1ed305466dd0aaeb995a5ca9f
This commit is contained in:
rabi 2022-01-07 07:31:40 +05:30
parent 3cca1f681a
commit 5326c3d5e3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,6 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
OS::TripleO::Services::ComputeNeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml
# With using default template values, the Compute nodes also need the br-ex
# bridge to be connected to a physical network.
ComputeNetworkConfigTemplate: 'templates/net_config_bridge.j2'
# Disable OVN services
OS::TripleO::Services::OVNController: OS::Heat::None
OS::TripleO::Services::OVNDBs: OS::Heat::None
@ -42,6 +38,10 @@ parameter_defaults:
KernelIpNonLocalBind: 0
DhcpAgentNotification: true
# With using default template values, the Compute nodes also need the br-ex
# bridge to be connected to a physical network.
ComputeNetworkConfigTemplate: 'templates/net_config_bridge.j2'
# Setting NeutronEnableDVR enables distributed routing support in the
# ML2 plugin and agents that support this feature
NeutronEnableDVR: true

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

@ -14,7 +14,6 @@ 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
ComputeDVRNetworkConfigTemplate: 'templates/net_config_bridge.j2'
# Disable OVN services
OS::TripleO::Services::OVNController: OS::Heat::None
@ -30,6 +29,8 @@ parameter_defaults:
#L2 population require ARP responder feature
NeutronEnableARPResponder: true
ComputeDVRNetworkConfigTemplate: 'templates/net_config_bridge.j2'
NeutronPluginExtensions: "qos,port_security"
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
NeutronNetworkType: 'vxlan'