diff options
Diffstat (limited to 'ansible/roles/build_yardstick_image')
| -rw-r--r-- | ansible/roles/build_yardstick_image/tasks/cloudimg_modify_nsb.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/build_yardstick_image/tasks/post_build.yml | 11 |
2 files changed, 5 insertions, 14 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 8e2c3a623..65b9b8188 100644 --- 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 }}" +- 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: @@ -72,9 +77,6 @@ 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 diff --git a/ansible/roles/build_yardstick_image/tasks/post_build.yml b/ansible/roles/build_yardstick_image/tasks/post_build.yml index abbf57c03..14b7a3d17 100644 --- a/ansible/roles/build_yardstick_image/tasks/post_build.yml +++ b/ansible/roles/build_yardstick_image/tasks/post_build.yml @@ -51,17 +51,6 @@ - set_fact:
imgdest: "/var/lib/libvirt/images/{{ imgfile | basename}}"
- name: "{{ (imgfile | basename | splitext)[0] }}"
- ext: "{{ (imgfile | basename | splitext)[1] }}"
-
-- name: Verify if imgfile exists in libvirt images
- stat:
- path: "{{ imgdest }}"
- register: imgdest_stat
-
-- set_fact:
- imgdest: "/var/lib/libvirt/images/{{ name }}_autogen{{ ext }}"
- when: imgdest_stat.stat.exists
- name: Copy image to libvirt images
shell: "cp {{ imgfile }} {{ imgdest }}"
|