openstack/tripleo-heat-templates
Code Issues Proposed changes

Add trunk service plugin to OVN environment files

Browse Source 
Change-Id: I0116168d525d219c1c5a0de1980b0e0162dfbf90
Closes-Bug: #1715087
(cherry picked from commit fe8551a056)
This commit is contained in:
Assaf Muller 2017-09-11 15:25:57 -04:00 committed by Daniel Alvarez
parent 0d85aa1788
commit e2722c8493
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-ml2-ovn-ha.yaml
View File

@ -21,7 +21,7 @@ parameter_defaults:
NeutronEnableDHCPAgent: false NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve' NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router' NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ] NeutronVniRanges: ['1:65536', ]
ComputeParameters: ComputeParameters:

2
environments/neutron-ml2-ovn.yaml
View File

@ -21,7 +21,7 @@ parameter_defaults:
NeutronEnableDHCPAgent: false NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve' NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router' NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ] NeutronVniRanges: ['1:65536', ]
ComputeParameters: ComputeParameters:

2
environments/services-docker/neutron-ovn-ha.yaml
View File

@ -21,7 +21,7 @@ parameter_defaults:
NeutronEnableDHCPAgent: false NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve' NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router' NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ] NeutronVniRanges: ['1:65536', ]
# TODO (numans) - This is temporary and needs to be handled in tripleo-common # TODO (numans) - This is temporary and needs to be handled in tripleo-common
DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest' DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest'

2
environments/services-docker/neutron-ovn.yaml
View File

@ -21,7 +21,7 @@ parameter_defaults:
NeutronEnableDHCPAgent: false NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve' NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router' NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ] NeutronVniRanges: ['1:65536', ]
DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest' DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest'
DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest' DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest'