Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Unify different VNF testcases TG and VNF names"
[yardstick.git]
/
ansible
/
ubuntu_server_cloudimg_modify_samplevnfs.yml
diff --git
a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
index
dff7f97
..
d894c3d
100644
(file)
--- 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
connection: chroot
vars:
clone_dir: /tmp/yardstick-clone
+ vars_files:
+ - roles/download_dpdk/defaults/main.yml
pre_tasks:
- debug:
pre_tasks:
- debug:
@@
-35,16
+37,21
@@
- increase_open_file_limits
- modify_cloud_config
- install_image_dependencies
- 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
- 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_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
- role: install_samplevnf
vnf_name: UDP_Replay
- role: install_samplevnf
@@
-52,7
+59,7
@@
- role: install_samplevnf
vnf_name: FW
- role: install_samplevnf
- role: install_samplevnf
vnf_name: FW
- role: install_samplevnf
- vnf_name: CGNA
TP
+ vnf_name: CGNA
PT
# build shared DPDK for collectd only, required DPDK downloaded already
- install_dpdk_shared
- install_rabbitmq
# build shared DPDK for collectd only, required DPDK downloaded already
- install_dpdk_shared
- install_rabbitmq
@@
-62,3
+69,5
@@
- install_pmu_tools
- download_collectd
- install_collectd
- install_pmu_tools
- download_collectd
- install_collectd
+ - download_drivers
+ - install_drivers