commit 93d43cc9d765df3c0c2d9f3f050cc7d85240efab
author Jakub Josef <jjosef@mirantis.com> Tue Oct 10 13:55:21 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Tue Oct 10 13:55:21 2017 +0000
tree a6f0d6e5590e87d3c94c294175dcfbdb07f83c33
parent 0cc690931c14c90284451a60f3d6b9d42d7d8db2
parent 586a770d454f2ead3567aabafcf5d21e7c589f54

Merge "Remove references to the neutron:server:plugin parameter"

neutron/control/openvswitch/cluster.yml

diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 54db248..032ffbf 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -14,7 +14,6 @@
     neutron_enable_vlan_aware_vms: False
   neutron:
     server:
-      plugin: ml2
       global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
       l3_ha: ${_param:neutron_l3_ha}
       dvr: ${_param:neutron_control_dvr}

neutron/control/openvswitch/single.yml

diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index bdc050d..009c116 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -12,7 +12,6 @@
     neutron_enable_vlan_aware_vms: False
   neutron:
     server:
-      plugin: ml2
       global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
       l3_ha: ${_param:neutron_l3_ha}
       dvr: ${_param:neutron_control_dvr}