aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStepan Andrushko <stepanx.andrushko@intel.com>2019-01-04 20:06:40 +0200
committerStepan Andrushko <stepanx.andrushko@intel.com>2019-01-04 20:06:40 +0200
commitbc8c59da847d5babb5bfb8f272301b99b880f8e3 (patch)
treee501fb62247b4fccc1683e692a83d63ccedf34d8
parentfd5fdb646ae46819fe2f80e35d0d2630a620e8ee (diff)
Update to DPDK 18.11 support fro PROX
Fix for undefined INSTALL_BIN_PATH variable and missing DPDK 18.11 dependency on libnuma-dev. JIRA: YARDSTICK-1576 Change-Id: I544bc727f5ddc5bc43ac6ce4d1f8ff35c90077c7 Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
-rw-r--r--ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml6
-rw-r--r--ansible/roles/install_image_dependencies/defaults/main.yml1
2 files changed, 4 insertions, 3 deletions
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 c2f72ca..c9e3863 100644
--- a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
+++ b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
@@ -72,6 +72,9 @@
loop_var: role_item
environment: "{{ proxy_env }}"
+- include_vars: roles/install_dpdk/defaults/main.yml
+ when: INSTALL_BIN_PATH is undefined
+
- name: Install PROX
include_role:
name: install_samplevnf
@@ -89,9 +92,6 @@
loop_var: role_item
environment: "{{ proxy_env }}"
-- include_vars: roles/install_dpdk/defaults/main.yml
- when: INSTALL_BIN_PATH is undefined
-
- include_vars: roles/download_samplevnfs/defaults/main.yml
when: samplevnf_dest is undefined
- set_fact:
diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml
index 7a3f5fa..42951bf 100644
--- a/ansible/roles/install_image_dependencies/defaults/main.yml
+++ b/ansible/roles/install_image_dependencies/defaults/main.yml
@@ -29,6 +29,7 @@ install_dependencies:
- libxft-dev
- libxss-dev
- expect
+ - libnuma-dev
RedHat:
- bc
- fio