commit 2988a9c978eaae1783ff1c9425d8db884ceb9e13
author Jenkins <jenkins@review.openstack.org> Sat Mar 01 16:37:59 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Mar 01 16:37:59 2014 +0000
tree ad8de8f371a5d3daf3ffcaa28f8c468a04b80173
parent 5894db323ff528c56bd036243ee15aad91e34fef
parent a8880cc22c540e88c43da4e49fa6c976361484e4

Merge "Use glance image-show to check for uploaded Docker images"

lib/nova_plugins/hypervisor-docker

diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker
index f8dc6af..cdbc4d1 100644
--- a/lib/nova_plugins/hypervisor-docker
+++ b/lib/nova_plugins/hypervisor-docker
@@ -104,8 +104,7 @@
     fi
 
     # Make sure we copied the image in Glance
-    DOCKER_IMAGE=$(glance image-list | egrep " $DOCKER_IMAGE_NAME ")
-    if ! is_set DOCKER_IMAGE ; then
+    if ! (glance image-show "$DOCKER_IMAGE"); then
         docker push $DOCKER_REPOSITORY_NAME
     fi
 }