From: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Date: Thu, 8 Mar 2018 09:54:35 +0000 (+0000)
Subject: Merge "Allow VMs to access internet"
X-Git-Tag: opnfv-6.0.0~91
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9c50ed0e9bdb4dec5a95af40eb0e89ee962fcd40;hp=-c;p=yardstick.git

Merge "Allow VMs to access internet"
---

9c50ed0e9bdb4dec5a95af40eb0e89ee962fcd40
diff --combined ansible/roles/infra_create_vms/tasks/configure_vm.yml
index 5685e634f,94f6f133e..7419fd565
--- a/ansible/roles/infra_create_vms/tasks/configure_vm.yml
+++ b/ansible/roles/infra_create_vms/tasks/configure_vm.yml
@@@ -305,7 -305,7 +305,7 @@@
  
  - name: Populate network-config and add interface to xml file
    include_tasks: create_interfaces.yml
-   extra_vars: "{{ network_config, xml_file , slot_address, mac_address_counter }}"
+   extra_vars: "{{ network_config xml_file slot_address mac_address_counter }}"
    loop_control:
      loop_var: interface_item
    with_items: "{{ node_item.interfaces }}"
@@@ -326,9 -326,9 +326,9 @@@
    shell: >
      qemu-img convert -O qcow2 {{ node_item.image }} {{ image_dir+node_item.hostname+'.qcow2' }}
  
- - name: Copy and convert the ubuntu image
+ - name: Resize image
    shell: >
 -    qemu-img resize {{ image_dir+node_item.hostname+'.qcow2' }} {{ node_item.disk }}MB
 +    qemu-img resize {{ image_dir+node_item.hostname+'.qcow2' }} {{ node_item.disk }}M
  
  - name: Define the VMs
    virt: