Optimize resulted vm

Author: 0lvin

cloudify_libvirt/network_tasks.py

@@ -151,7 +151,8 @@ def link(**kwargs):
                     ctx.logger.info("{}:Found: {}"
                                     .format(vm_id, lease.get('ipaddr')))
                     return
-        time.sleep(30)
+        # we have never get ip before 60 sec, so wait 60 as minimum
+        time.sleep(60)
 
     raise cfy_exc.RecoverableError(
         'No ip for now, try later'

cloudify_libvirt/templates/domain.xml

@@ -15,31 +15,22 @@
       <alias name="balloon0"/>
       <address function="0x0" type="pci" domain="0x0000" slot="0x04" bus="0x00"/>
     </memballoon>
-    <controller type="usb" index="0">
-      <alias name="usb0"/>
-      <address function="0x2" type="pci" domain="0x0000" slot="0x01" bus="0x00"/>
-    </controller>
     <controller type="pci" index="0" model="pci-root">
       <alias name="pci.0"/>
     </controller>
     <controller type="ide" index="0">
       <alias name="ide0"/>
       <address function="0x1" type="pci" domain="0x0000" slot="0x01" bus="0x00"/>
     </controller>
-    <video>
-      <alias name="video0"/>
-      <model heads="1" type="cirrus" vram="9216"/>
-      <address function="0x0" type="pci" domain="0x0000" slot="0x02" bus="0x00"/>
-    </video>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <graphics autoport="yes" type="vnc" listen="127.0.0.1" port="5900">
-      <listen type="address" address="127.0.0.1"/>
-    </graphics>
     {% for network in networks %}
       <interface type="network">
         <target dev="{{ network.dev }}"/>
         <source network="{{ network.network }}"/>
         <mac address="{{ network.mac }}"/>
+        {% if network.type %}
+            <model type="{{ network.type }}" />
+        {% endif %}
       </interface>
     {% endfor %}
     <input type="mouse" bus="ps2"/>

examples/scripts/download_vm.sh

@@ -1,5 +1,5 @@
 ctx logger info "Download base image ${DISK}"
 
-LANG=C wget -cv "https://cloud-images.ubuntu.com/trusty/20170919/${DISK}"
+LANG=C wget -cv "https://cloud-images.ubuntu.com/trusty/current/${DISK}"
 
 ctx instance runtime-properties vm_image "`pwd`/${DISK}"

examples/scripts/vm_preconfigure.py

@@ -35,6 +35,8 @@
 
     networks = ctx.source.instance.runtime_properties["params"].get('networks')
     for network in networks:
+        if not network.get('type'):
+            network['type'] = "virtio"
         if not network.get('mac'):
             octet_full = (time.time() * 1000) % (256 * 256 * 256)
             octet_low = octet_full / 256

examples/templates/domain-arm.xml

@@ -7,6 +7,10 @@
   <on_poweroff>destroy</on_poweroff>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <memballoon model="virtio">
+      <alias name="balloon0"/>
+      <address function="0x0" type="pci" domain="0x0000" slot="0x04" bus="0x00"/>
+    </memballoon>
     <controller type='scsi' index='0' model='virtio-scsi'>
       <alias name='scsi0'/>
       <address type='virtio-mmio'/>
@@ -30,15 +34,18 @@
         <target dev="{{ network.dev }}"/>
         <source network="{{ network.network }}"/>
         <mac address="{{ network.mac }}"/>
+        {% if network.type %}
+            <model type="{{ network.type }}" />
+        {% endif %}
       </interface>
     {% endfor %}
-    <console type='pty' tty='/dev/pts/9'>
-      <source path='/dev/pts/9'/>
+    <console type='pty' tty='/dev/pts/1'>
+      <source path='/dev/pts/1'/>
       <target type='serial' port='0'/>
       <alias name='serial0'/>
     </console>
     <serial type='pty'>
-      <source path='/dev/pts/9'/>
+      <source path='/dev/pts/1'/>
       <target port='0'/>
       <alias name='serial0'/>
     </serial>