From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 16 Aug 2012 01:37:28 +0000 (+0000)
Subject: Merge "add ability to clone images"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bc5c955036208a89e53a0f39d8c14ee6c927317b;p=openstack-build%2Fcinder-build.git

Merge "add ability to clone images"
---

bc5c955036208a89e53a0f39d8c14ee6c927317b
diff --cc cinder/volume/manager.py
index 680e480ac,a40948f17..eee3d8631
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@@ -150,10 -157,9 +159,10 @@@ class VolumeManager(manager.SchedulerDe
          LOG.debug(_("volume %s: created successfully"), volume_ref['name'])
          self._reset_stats()
  
-         if image_id:
+         if image_id and not cloned:
              #copy the image onto the volume.
              self._copy_image_to_volume(context, volume_ref, image_id)
 +        self._notify_about_volume_usage(context, volume_ref, "create.end")
          return volume_ref['id']
  
      def delete_volume(self, context, volume_id):