Merge branch 'master' into x/gitlab

* master:
  Advertise development of new version
  use slapos.cookbook 1.0.16 and slapos.core 1.3.14
  Release 1.0.16
  kvm recipe fixup: disk creation and image download
  component/xz: v↑  (5.2.2)

CHANGES.txt

 Changes
 =======
 
+1.0.16 (2015-10.27)
+-------------------
+ * kvm recipe: fix bugs dowload image and disk creation
+
 1.0.14 (2015-10.26)
 -------------------
  * kvm recipe: Allow to set keyboard layout language used by qemu and VNC

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.15.dev0'
+version = '1.0.17.dev0'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/kvm/template/kvm_run.in

@@ -13,6 +13,10 @@ from random import shuffle
 import glob
 import re
 
+import ssl
+
+opener = urllib.FancyURLopener(context=ssl._create_unverified_context())
+
 # XXX: give all of this through parameter, don't use this as template, but as module
 qemu_img_path = '%(qemu-img-path)s'
 qemu_path = '%(qemu-path)s'
@@ -127,9 +131,10 @@ if not os.path.exists(disk_path) and virtual_hard_drive_url != '':
     downloaded_disk = disk_path
     if virtual_hard_drive_gzipped == 'true':
       downloaded_disk = '%%s.gz' %% disk_path
-    urllib.urlretrieve(virtual_hard_drive_url, downloaded_disk)
+    opener.retrieve(virtual_hard_drive_url, downloaded_disk)
   except:
-    os.remove(downloaded_disk)
+    if os.path.exists(downloaded_disk):
+      os.remove(downloaded_disk)
     raise
   md5sum = virtual_hard_drive_md5sum.strip()
   if md5sum:
@@ -157,7 +162,7 @@ if not os.path.exists(disk_path) and virtual_hard_drive_url != '':
 # XXX: move to Buildout profile
 if not os.path.exists(disk_path):
   print('Creating virtual hard drive...')
-  subprocess.Popen([qemu_img_path, 'create' ,'-f', 'qcow2',
+  subprocess.check_call([qemu_img_path, 'create' ,'-f', 'qcow2',
       disk_path, '%%sG' %% disk_size])
   print('Done.')
 
@@ -186,7 +191,7 @@ if disk_storage_dict:
         disk_list = glob.glob('%%s.*' %% os.path.join(path, 'kvm_virtual_disk'))
         if disk_list == []:
           print('Creating one additional virtual hard drive...')
-          subprocess.Popen([qemu_img_path, 'create' ,'-f', '%%s' %% external_disk_format,
+          process = subprocess.check_call([qemu_img_path, 'create' ,'-f', '%%s' %% external_disk_format,
               disk_filepath, '%%sG' %% external_disk_size])
         else:
           # Cannot change or recreate if disk is exists

stack/slapos.cfg

@@ -138,8 +138,8 @@ requests = 2.8.1
 setuptools = 18.1
 simplejson = 3.8.0
 six = 1.10.0
-slapos.cookbook = 1.0.14
-slapos.core = 1.3.13
+slapos.cookbook = 1.0.16
+slapos.core = 1.3.14
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
 slapos.recipe.build = 0.23
@@ -149,7 +149,7 @@ unicodecsv = 0.14.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==1.3.13
+# slapos.core==1.3.14
 Flask = 0.10.1
 
 # Required by:
@@ -174,15 +174,15 @@ functools32 = 3.2.3.post2
 ipaddress = 1.0.14
 
 # Required by:
-# slapos.cookbook==1.0.14
+# slapos.cookbook==1.0.16
 jsonschema = 2.5.1
 
 # Required by:
-# slapos.cookbook==1.0.14
+# slapos.cookbook==1.0.16
 lock-file = 2.0
 
 # Required by:
-# slapos.core==1.3.13
+# slapos.core==1.3.14
 netifaces = 0.10.4
 
 # Required by:
@@ -190,15 +190,15 @@ netifaces = 0.10.4
 pycparser = 2.14
 
 # Required by:
-# slapos.core==1.3.13
+# slapos.core==1.3.14
 supervisor = 3.1.3
 
 # Required by:
-# slapos.core==1.3.13
+# slapos.core==1.3.14
 uritemplate = 0.6
 
 # Required by:
-# slapos.core==1.3.13
+# slapos.core==1.3.14
 zope.interface = 4.1.3
 
 [networkcache]