From 92d295fc145f02f8c28f8cd71c2822dfb3e7f872 Mon Sep 17 00:00:00 2001
From: Oleksandr Naumets <oleksandrx.naumets@intel.com>
Date: Thu, 27 Dec 2018 16:20:19 +0000
Subject: Add support of DPDK version 18.11 for PROX, igb_uio

Adding DPDK version 18.11 support as per new requirement for PROX.
Since other sample VNFs are not supporting DPDK 18.11, they will
be using default DPDK version (17.05).

JIRA: YARDSTICK-1576

Change-Id: Ifab1886c51a22392f52f3e9e515a9d6b81edeefc
Signed-off-by: Oleksandr Naumets <oleksandrx.naumets@intel.com>
---
 .../tasks/cloudimg_modify_nsb.yml                  | 33 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml')

diff --git a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
index 9a70ff39a..c2f72cada 100644
--- a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
+++ b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
@@ -52,19 +52,43 @@
     - install_image_dependencies
     - enable_hugepages_on_boot    # can't update grub in chroot/docker
     - increase_open_file_limits   # needed for collectd plugins
-    - download_dpdk
-    - install_dpdk
     - download_trex
     - install_trex
-    - download_pktgen
-    - install_pktgen
     - download_civetweb
     - install_civetweb
+  loop_control:
+    loop_var: role_item
+  environment: "{{ proxy_env }}"
+
+- include_role:
+    name: "{{ role_item }}"
+  vars:
+    dpdk_version: "{{ dpdk_version_for_PROX }}"
+  with_items:
+    - download_dpdk
+    - install_dpdk
     - download_samplevnfs
   loop_control:
     loop_var: role_item
   environment: "{{ proxy_env }}"
 
+- name: Install PROX
+  include_role:
+    name: install_samplevnf
+  vars:
+    vnf_name: PROX
+
+- include_role:
+    name: "{{ role_item }}"
+  with_items:
+    - download_dpdk
+    - install_dpdk
+    - download_pktgen
+    - install_pktgen
+  loop_control:
+    loop_var: role_item
+  environment: "{{ proxy_env }}"
+
 - include_vars: roles/install_dpdk/defaults/main.yml
   when: INSTALL_BIN_PATH is undefined
 
@@ -75,7 +99,6 @@
 - include_role:
     name: install_samplevnf
   with_items:
-    - PROX
     - UDP_Replay
     - ACL
     - FW
-- 
cgit 1.2.3-korg