X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Fubuntu_server_cloudimg_modify_samplevnfs.yml;h=d894c3dc4e136c7d66cc9bf256b37c47ae188e40;hb=628e26a7516e4cf8b7648ad81c35695dba896536;hp=85afa2a30d34b5a752e0c024ad4466c1632ef5b5;hpb=7dde4c902675ff27143701d067510c58f3bd6207;p=yardstick.git

diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
index 85afa2a30..d894c3dc4 100644
--- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
+++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
@@ -16,6 +16,8 @@
   connection: chroot
   vars:
     clone_dir: /tmp/yardstick-clone
+  vars_files:
+    - roles/download_dpdk/defaults/main.yml
 
   pre_tasks:
     - debug:
@@ -35,16 +37,21 @@
     - increase_open_file_limits
     - modify_cloud_config
     - install_image_dependencies
-    - role: download_dpdk
-#      dpdk_version: "17.02"
-    - install_dpdk
     - download_trex
     - install_trex
     - download_civetweb
     - install_civetweb
+    - role: download_dpdk
+      dpdk_version: "{{ dpdk_version_for_PROX }}"
+    - role: install_dpdk
+      dpdk_version: "{{ dpdk_version_for_PROX }}"
     - download_samplevnfs
     - role: install_samplevnf
       vnf_name: PROX
+    - download_dpdk
+    - install_dpdk
+    - download_pktgen
+    - install_pktgen
     - role: install_samplevnf
       vnf_name: UDP_Replay
     - role: install_samplevnf
@@ -52,7 +59,7 @@
     - role: install_samplevnf
       vnf_name: FW
     - role: install_samplevnf
-      vnf_name: CGNATP
+      vnf_name: CGNAPT
     # build shared DPDK for collectd only, required DPDK downloaded already
     - install_dpdk_shared
     - install_rabbitmq