Merge branch 'master' into develop

Bump version to 0.7.3next

ChangeLog

+2014-10-21, v0.7.3
+	* Instruct kamaki to ignore the ssl certificates (kamaki >= 0.13rc5).
+
+2014-10-14, v0.7.2
+	* Fix an exception triggered when collecting Ubuntu metadata
+
 2014-10-06, v0.7.1
 	* Fix a bug in host bundling operation where the file system UUIDs and
 	  Labels where not preserved

image_creator/kamaki_wrapper.py

@@ -30,6 +30,12 @@ from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
 from kamaki.clients.astakos import CachedAstakosClient as AstakosClient
 
+try:
+    from kamaki.clients.utils import https
+    https.patch_ignore_ssl()
+except ImportError:
+    pass
+
 try:
     config = Config()
 except Exception as e:

image_creator/os_type/ubuntu.py

@@ -30,7 +30,7 @@ class Ubuntu(Linux):
 
         super(Ubuntu, self)._do_collect_metadata()
 
-        regexp = re.compile('^(k|l|x)?ubuntu-desktop$')
+        regexp = re.compile('^(k|l|x)ubuntu-desktop$')
         variant = ""
         for app in self.image.g.inspect_list_applications(self.root):
             match = regexp.match(app['app_name'])

image_creator/version.py

 
-__version__ = "0.7.1next"
+__version__ = "0.7.3next"
 __version_vcs_info__ = {
     'branch': 'develop',
-    'revid': '38f51b2',
-    'revno': 573}
+    'revid': 'bcce9f1',
+    'revno': 582}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"

version

-0.7.1next
+0.7.3next