From 24b1dd4464f6b86d73b15a4b3f0984a2d597750f Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Mon, 13 Feb 2017 12:53:48 -0500
Subject: [PATCH] Remove OVS with DPDK

Change-Id: I6999ef2219d21286ffe95f1dd67b440b543020ac
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 deployment_scripts/puppet/manifests/ovs-install.pp |  2 +-
 deployment_tasks.yaml                              | 13 -------------
 environment_config.yaml                            |  5 -----
 pre_build_hook                                     |  3 ---
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/ovs-install.pp b/deployment_scripts/puppet/manifests/ovs-install.pp
index ed30bfd..dff5b31 100644
--- a/deployment_scripts/puppet/manifests/ovs-install.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install.pp
@@ -4,7 +4,7 @@ $master_ip      = hiera('master_ip')
 $ovs_settings   = hiera('fuel-plugin-ovs')
 
 $install_nsh    = $ovs_settings['install_nsh']
-$install_dpdk   = $ovs_settings['install_dpdk']
+$install_dpdk   = 'false'
 
 if $operatingsystem == 'Ubuntu' {
   if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b8de3ed..59b2de0 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -8,16 +8,3 @@
     puppet_manifest: puppet/manifests/ovs-install.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
-
-- id: update_flavors
-  type: puppet
-  version: 2.1.0
-  role: [primary-controller]
-  requires: [post_deployment_start]
-  required_for: [post_deployment_end]
-  condition:
-    yaql_exp: $.get('fuel-plugin-ovs').install_dpdk
-  parameters:
-    puppet_manifest: puppet/manifests/ovs-update-flavors.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
diff --git a/environment_config.yaml b/environment_config.yaml
index 3a1fe53..f04d641 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,9 +1,4 @@
 attributes:
-    install_dpdk:
-      type: "checkbox"
-      weight: 20
-      value: false
-      label: "Install DPDK"
     install_nsh:
       type: "checkbox"
       weight: 20
diff --git a/pre_build_hook b/pre_build_hook
index 03c91c2..a955678 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -20,9 +20,6 @@ function build_pkg {
       sudo docker build -t ovs_build .
 
       DEB_DIR=${DIR}/deb-ovs-dpdk
-      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
-      sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
-      cp -r ${DEB_DIR}/*  ${DIR}/repositories/ubuntu/
 
       rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
       sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-nsh.sh