Merge "Remove VXLAN type driver from OVN environment files"

2017-10-14 01:32:19 +00:00
parent 76a63450c1 317ca9c0a9
commit 9c4ae7ba9e
4 changed files with 4 additions and 4 deletions
--- a/environments/neutron-ml2-ovn-ha.yaml
+++ b/environments/neutron-ml2-ovn-ha.yaml
@@ -19,7 +19,7 @@ parameter_defaults:
  OVNQosDriver: ovn-qos
  OVNTunnelEncapType: geneve
  NeutronEnableDHCPAgent: false
-  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
+  NeutronTypeDrivers: 'geneve,vlan,flat'
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router'
  NeutronVniRanges: ['1:65536', ]
--- a/environments/neutron-ml2-ovn.yaml
+++ b/environments/neutron-ml2-ovn.yaml
@@ -19,7 +19,7 @@ parameter_defaults:
  OVNQosDriver: ovn-qos
  OVNTunnelEncapType: geneve
  NeutronEnableDHCPAgent: false
-  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
+  NeutronTypeDrivers: 'geneve,vlan,flat'
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router'
  NeutronVniRanges: ['1:65536', ]
--- a/environments/services-docker/neutron-ovn-ha.yaml
+++ b/environments/services-docker/neutron-ovn-ha.yaml
@@ -19,7 +19,7 @@ parameter_defaults:
  OVNQosDriver: ovn-qos
  OVNTunnelEncapType: geneve
  NeutronEnableDHCPAgent: false
-  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
+  NeutronTypeDrivers: 'geneve,vlan,flat'
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router'
  NeutronVniRanges: ['1:65536', ]
--- a/environments/services-docker/neutron-ovn.yaml
+++ b/environments/services-docker/neutron-ovn.yaml
@@ -19,7 +19,7 @@ parameter_defaults:
  OVNQosDriver: ovn-qos
  OVNTunnelEncapType: geneve
  NeutronEnableDHCPAgent: false
-  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
+  NeutronTypeDrivers: 'geneve,vlan,flat'
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router'
  NeutronVniRanges: ['1:65536', ]