openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove OVNTunnelEncapType"

Browse Source
This commit is contained in:
Zuul 2019-05-11 01:54:52 +00:00 committed by Gerrit Code Review
commit 08ead26e66
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -40,10 +40,6 @@ parameters:
description: Port of the Southbound DB Server
type: number
default: 6642
OVNTunnelEncapType:
description: Tunnel encapsulation type
type: string
default: geneve
NeutronBridgeMappings:
description: >
The OVS logical->physical bridge mappings to use. See the Neutron
@ -114,7 +110,6 @@ outputs:
map_merge:
- get_attr: [RoleParametersValue, value]
- ovn::southbound::port: {get_param: OVNSouthboundServerPort}
ovn::controller::ovn_encap_type: {get_param: OVNTunnelEncapType}
ovn::controller::ovn_encap_ip:
str_replace:
template:

7
releasenotes/notes/ovn_tunnel_encap_type-04df21d622874c27.yaml Normal file
View File

@ -0,0 +1,7 @@
---
deprecations:
- |
The only OVN Tunnel Encap Type that we are supporting in OVN is Geneve
and this is set by default in ovn puppet. So there are no need to set
it in TripleO