Merge "Move *NetworkConfigTemplate to parameter_defaults"

This commit is contained in:
Zuul 2022-01-07 17:31:08 +00:00 committed by Gerrit Code Review
commit a649c2b523
2 changed files with 6 additions and 5 deletions

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

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'