Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Log VM OS version, Sample VNF branch/commit ID
[yardstick.git]
/
ansible
/
roles
/
build_yardstick_image
/
tasks
/
cloudimg_modify_nsb.yml
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
8e2c3a6
..
65b9b81
100644
(file)
--- a/
ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
+++ b/
ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml
@@
-60,6
+60,11
@@
loop_var: role_item
environment: "{{ proxy_env }}"
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
+
- include_role:
name: "{{ role_item }}"
vars:
- include_role:
name: "{{ role_item }}"
vars:
@@
-72,9
+77,6
@@
loop_var: role_item
environment: "{{ proxy_env }}"
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
- name: Install PROX
include_role:
name: install_samplevnf