1 files changed, 32 insertions, 7 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 9a70ff39a..65b9b8188 100644
--- a/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
+++ b/ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Intel Corporation.
+# Copyright (c) 2018-2019 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,15 +52,10 @@
     - 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
-    - download_samplevnfs
   loop_control:
     loop_var: role_item
   environment: "{{ proxy_env }}"
@@ -69,13 +64,43 @@
   when: INSTALL_BIN_PATH is undefined
 
 - include_vars: roles/download_samplevnfs/defaults/main.yml
+
+- 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/download_samplevnfs/defaults/main.yml
   when: samplevnf_dest is undefined
 - set_fact:
     samplevnf_path: "{{ samplevnf_dest }}"
 - include_role:
     name: install_samplevnf
   with_items:
-    - PROX
     - UDP_Replay
     - ACL
     - FW