Merge lp:~pwlars/core-image-publisher/build-cloud-image into lp:core-image-publisher

[Paul Larson]

add support for building and converting the cloud image

Work in progress to add support for building and converting the cloud image

[Thomi Richards (thomir-deactivatedaccount)]

Happy to land once you fix the one note I made in the diff.

Unmerged revisions

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-03-27 03:29:44 +0000
+++ core_image_publisher/worker.py	2015-03-27 03:29:44 +0000
@@ -18,6 +18,9 @@
 """Business logic or the service lives here."""
 
 import logging
+import os
+import subprocess
+import tempfile
 from core_image_publisher.queue import enqueue_message
 
 logger = logging.getLogger(__name__)
@@ -39,22 +42,49 @@
         message.reject()
         return
 
-    image_path = download_image(image_name, channel, device)
-    nova_image_path = convert_nova_image(image_path)
-    glance_image_name = upload_image_to_glance(nova_image_path)
+    with tempfile.TemporaryDirectory as tmpdir:
+        image_path = download_image(image_name, channel, device, tmpdir)
+        nova_image_path = convert_nova_image(image_path)
+        glance_image_name = upload_image_to_glance(nova_image_path)
 
     payload['nova_image'] = glance_image_name
     enqueue_message(payload)
     message.ack()
 
 
-def download_image(name, channel, device):
+def download_image(name, channel, device, tmpdir):
     """Download the ubuntu code image, return a path to it on disk."""
+    image_path = os.path.join(tmpdir, 'core-{}.img'.format(name))
+    cmd = ['sudo',
+           'ubuntu-device-flash',
+           '--revision', name,
+           'core',
+           ' --device=generic_amd64',
+           '--channel', channel,
+           '--size', '3',
+           '-o', image_path,
+           '--developer-mode',
+           '--cloud']
+    subprocess.check_call(cmd)
+    return image_path
 
 
 def convert_nova_image(image_path):
-    """Convert a core image to a nova image, return path to the converted image."""
+    """
+    Convert a core image to a nova image, return path to the converted image.
+    """
+    converted_image_path = '{}-cloud.img'.format(image_path.strip('.img'))
+    cmd = ['qemu-img',
+           'convert',
+           '-f', 'raw',
+           '-O', 'qcow2',
+           image_path,
+           converted_image_path]
+    subprocess.check_call(cmd)
+    return converted_image_path
 
 
 def upload_image_to_glance(nova_image_path):
-    """Upload the nova image to glance, returning the name of the image in glance."""
+    """
+    Upload the nova image to glance, returning the name of the image in glance.
+    """