fuel-plugins: Fuel8 Liberty rebase

Change-Id: I9c0e3ab4c8fde13765ec286d4c7c717070230983
Signed-off-by: Michal Ptacek <michalx.ptacek@intel.com>

Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Billy O'Mahony <billy.o.mahony@intel.com>

1 files changed, 3 insertions, 23 deletions

diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/configure_bridges.sh b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/configure_bridges.sh
index c77258f..4a5c806 100755
--- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/configure_bridges.sh
+++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/configure_bridges.sh
@@ -1,25 +1,5 @@
 #!/usr/bin/env bash
 
-for bridge in `sudo ovs-vsctl list-br`; do sudo ovs-vsctl --no-wait set Bridge $bridge datapath_type=netdev; done;
-
-# Configure integration bridge with specified datapath
-#sudo ovs-vsctl --no-wait -- --may-exist add-br br-int
-#if [ "$1" != "" ]; then
-    #sudo ovs-vsctl --no-wait set Bridge br-int datapath_type=$1
-#fi
-#sudo ovs-vsctl --no-wait br-set-external-id br-int bridge-id br-int
-
-# Configure external bridge with specified datapath
-#sudo ovs-vsctl --no-wait -- --may-exist add-br br-ex
-#if [ "$1" != "" ]; then
-    #sudo ovs-vsctl --no-wait set Bridge br-ex datapath_type=$1
-#fi
-#sudo ovs-vsctl --no-wait br-set-external-id br-ex bridge-id br-ex
-
-# Configure br-tun bridge with specified datapath
-#sudo ovs-vsctl --no-wait -- --may-exist add-br br-tun
-#if [ "$1" != "" ]; then
-    #sudo ovs-vsctl --no-wait set Bridge br-tun datapath_type=$1
-#fi
-#sudo ovs-vsctl --no-wait br-set-external-id br-tun bridge-id br-tun
-
+for bridge in `sudo ovs-vsctl list-br`; do
+  sudo ovs-vsctl --no-wait set Bridge $bridge datapath_type=$1;
+done;