diff --git a/puppet/services/ovn-controller.yaml b/puppet/services/ovn-controller.yaml index 25471de084..b2c3bd7185 100644 --- a/puppet/services/ovn-controller.yaml +++ b/puppet/services/ovn-controller.yaml @@ -34,10 +34,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 @@ -98,7 +94,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: {get_param: [ServiceNetMap, NeutronTenantNetwork]} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} nova::compute::force_config_drive: {if: [force_config_drive, true, false]} diff --git a/releasenotes/notes/ovn_tunnel_encap_type-04df21d622874c27.yaml b/releasenotes/notes/ovn_tunnel_encap_type-04df21d622874c27.yaml new file mode 100644 index 0000000000..ec5f4db6f9 --- /dev/null +++ b/releasenotes/notes/ovn_tunnel_encap_type-04df21d622874c27.yaml @@ -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