From 3f0c4e845db5d7721b4062f576f12f3d0137de49 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 27 May 2016 16:21:41 -0500
Subject: [PATCH] enable the dpdk based on feature request.

Change-Id: I563649af6bdb2d666251e35c1c8f60641bc5c543
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/01-deploybundle.sh                       | 4 ++++
 ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml    | 7 +++++++
 ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 7 +++++++
 ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml   | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 9d11e2f7..2d4716fc 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -143,6 +143,10 @@ case "$5" in
     'odl_l3' )
          sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
         ;;
+    'dpdk; )
+         sed -i -- 's/#dpdk_enable: true/dpdk_enable: true/g' ./bundles.yaml
+         sed -i -- 's/#hugepages: '50%'/hugepages: '50%'/g' ./bundles.yaml
+        ;;
 esac
 
 echo "... Deployment Started ...."
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 6ff220c5..fb6b8a97 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -130,6 +130,12 @@ openstack-phase2:
         - "nodes=0"
     neutron-openvswitch:
       charm: "local:trusty/neutron-openvswitch"
+      options:
+        #enable-dpdk: true
+        #data-port: ""
+        #default-socket-memory: 1024
+        #defualt-socket-cores: 1
+        #dpdk-driver: uio_pci_generic
     nova-cloud-controller:
       charm: "local:trusty/nova-cloud-controller"
       num_units: 3
@@ -149,6 +155,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #hugepages: '50%'
       to:
         - "nodes=1"
         - "nodes=2"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 7b945e3c..ba83ab6c 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -104,6 +104,12 @@ openstack-phase2:
         - "nodes=0"
     neutron-openvswitch:
       charm: "local:trusty/neutron-openvswitch"
+      options:
+        #enable-dpdk: true
+        #data-port: ""
+        #default-socket-memory: 1024
+        #defualt-socket-cores: 1
+        #dpdk-driver: uio_pci_generic
     nova-cloud-controller:
       charm: "local:trusty/nova-cloud-controller"
       options:
@@ -117,6 +123,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #hugepages: '50%'
       to:
         - "nodes=1"
     openstack-dashboard:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 309da777..15ee33ec 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -102,6 +102,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #hugepages: '50%'
       to:
         - "nodes=1"
     nova-cloud-controller:
@@ -141,6 +142,11 @@ openstack-phase2:
       charm: "local:trusty/neutron-openvswitch"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
+        #enable-dpdk: true
+        #data-port: ""
+        #default-socket-memory: 1024
+        #defualt-socket-cores: 1
+        #dpdk-driver: uio_pci_generic
   relations:
     - - neutron-openvswitch:neutron-plugin-api
       - neutron-api:neutron-plugin-api
-- 
2.16.6