summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolodymyr Mytnyk <volodymyrx.mytnyk@intel.com>2019-01-08 13:09:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-08 13:09:11 +0000
commitf74b19f26243c185511a5f9eb35ac0f145c4f305 (patch)
tree0d61701a8f49bbe1d00f03f24d1519a03760c785
parent75883619fb111a23ed32c30a3498665d79a1fb72 (diff)
parentbc8c59da847d5babb5bfb8f272301b99b880f8e3 (diff)
Merge "Update to DPDK 18.11 support fro PROX"
-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 c2f72cada..c9e386346 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 7a3f5fa7e..42951bf6d 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