Check container_format before spawning the instance

docker-archive · Aug 25, 2013 · e4e388d · e4e388d
1 parent 602fa14
commit e4e388d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/contrib/glance-db-backend/__init__.py → .../DEPRECATED_glance-db-backend/__init__.py b/contrib/glance-db-backend/__init__.py → .../DEPRECATED_glance-db-backend/__init__.py
diff --git a/contrib/glance-db-backend/api.py → contrib/DEPRECATED_glance-db-backend/api.py b/contrib/glance-db-backend/api.py → contrib/DEPRECATED_glance-db-backend/api.py
diff --git a/nova-driver/driver.py b/nova-driver/driver.py
@@ -19,7 +19,6 @@
 A Docker Hypervisor which allows running Linux Containers instead of VMs.
 """
 
-import base64
 import os
 import random
 import socket
@@ -223,6 +222,11 @@ def _get_image_name(self, context, instance):
         (image_service, image_id) = glance.get_remote_image_service(
             context, instance['image_ref'])
         image = image_service.show(context, image_id)
+        fmt = image['container_format']
+        if fmt != 'docker':
+            raise exception.InstanceDeployFailure(
+                'Image container format not supported ({0})'.format(fmt),
+                instance_id=instance['name'])
         registry_port = self.docker.get_registry_port()
         return '{0}:{1}/{2}'.format(CONF.get('my_ip'),
                                     registry_port,